Commit c9f2480e authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

ufs: remove ufs_get_locked_page() 

Both callers are now converted to ufs_get_locked_folio().

Link: https://lkml.kernel.org/r/20231016201114.1928083-27-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Pankaj Raghav <p.raghav@samsung.com>
Cc: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c7e8812c

fs/ufs/util.c

+0 −9
Original line number Diff line number Diff line
@@ -229,15 +229,6 @@ ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev 
		ufsi->i_u1.i_data[0] = cpu_to_fs32(sb, fs32);

}



struct page *ufs_get_locked_page(struct address_space *mapping, pgoff_t index)

{

	struct folio *folio = ufs_get_locked_folio(mapping, index);



	if (folio)

		return folio_file_page(folio, index);

	return NULL;

}



/**

 * ufs_get_locked_folio() - locate, pin and lock a pagecache folio, if not exist

 * read it from disk.

fs/ufs/util.h

+0 −7
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ extern void _ubh_ubhcpymem_(struct ufs_sb_private_info *, unsigned char *, struc 
extern void _ubh_memcpyubh_(struct ufs_sb_private_info *, struct ufs_buffer_head *, unsigned char *, unsigned);



/* This functions works with cache pages*/

struct page *ufs_get_locked_page(struct address_space *mapping, pgoff_t index);

struct folio *ufs_get_locked_folio(struct address_space *mapping, pgoff_t index);

static inline void ufs_put_locked_folio(struct folio *folio)

{
@@ -281,12 +280,6 @@ static inline void ufs_put_locked_folio(struct folio *folio) 
       folio_put(folio);

}



static inline void ufs_put_locked_page(struct page *page)

{

	ufs_put_locked_folio(page_folio(page));

}





/*

 * macros and inline function to get important structures from ufs_sb_private_info

 */