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

buffer: convert getblk_unmovable() and __getblk() to use bdev_getblk() 

Move these two functions up in the file for the benefit of the next patch,
and pass in all of the GFP flags to use instead of the partial GFP flags
used by __getblk_gfp().

Link: https://lkml.kernel.org/r/20230914150011.843330-6-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Hui Zhu <teawater@antgroup.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 775d9b10

include/linux/buffer_head.h

+22 −14
Original line number Diff line number Diff line
@@ -340,6 +340,28 @@ sb_breadahead(struct super_block *sb, sector_t block) 
	__breadahead(sb->s_bdev, block, sb->s_blocksize);

}



static inline struct buffer_head *getblk_unmovable(struct block_device *bdev,

		sector_t block, unsigned size)

{

	gfp_t gfp;



	gfp = mapping_gfp_constraint(bdev->bd_inode->i_mapping, ~__GFP_FS);

	gfp |= __GFP_NOFAIL;



	return bdev_getblk(bdev, block, size, gfp);

}



static inline struct buffer_head *__getblk(struct block_device *bdev,

		sector_t block, unsigned size)

{

	gfp_t gfp;



	gfp = mapping_gfp_constraint(bdev->bd_inode->i_mapping, ~__GFP_FS);

	gfp |= __GFP_MOVABLE | __GFP_NOFAIL;



	return bdev_getblk(bdev, block, size, gfp);

}



static inline struct buffer_head *

sb_getblk(struct super_block *sb, sector_t block)

{
@@ -387,20 +409,6 @@ static inline void lock_buffer(struct buffer_head *bh) 
		__lock_buffer(bh);

}



static inline struct buffer_head *getblk_unmovable(struct block_device *bdev,

						   sector_t block,

						   unsigned size)

{

	return __getblk_gfp(bdev, block, size, 0);

}



static inline struct buffer_head *__getblk(struct block_device *bdev,

					   sector_t block,

					   unsigned size)

{

	return __getblk_gfp(bdev, block, size, __GFP_MOVABLE);

}



static inline void bh_readahead(struct buffer_head *bh, blk_opf_t op_flags)

{

	if (!buffer_uptodate(bh) && trylock_buffer(bh)) {