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

buffer: remove __getblk_gfp() 

Inline it into __bread_gfp().

Link: https://lkml.kernel.org/r/20230914150011.843330-9-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 8a83ac54

fs/buffer.c

+11 −25
Original line number Diff line number Diff line
@@ -1421,9 +1421,6 @@ EXPORT_SYMBOL(__find_get_block); 
 * @size: The size of buffer_heads for this @bdev.

 * @gfp: The memory allocation flags to use.

 *

 * In contrast to __getblk_gfp(), the @gfp flags must be all of the flags;

 * they are not augmented with the mapping's GFP flags.

 *

 * Return: The buffer head, or NULL if memory could not be allocated.

 */

struct buffer_head *bdev_getblk(struct block_device *bdev, sector_t block,
@@ -1439,27 +1436,6 @@ struct buffer_head *bdev_getblk(struct block_device *bdev, sector_t block, 
}

EXPORT_SYMBOL(bdev_getblk);



/*

 * __getblk_gfp() will locate (and, if necessary, create) the buffer_head

 * which corresponds to the passed block_device, block and size. The

 * returned buffer has its reference count incremented.

 */

struct buffer_head *

__getblk_gfp(struct block_device *bdev, sector_t block,

	     unsigned size, gfp_t gfp)

{

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



	/*

	 * Prefer looping in the allocator rather than here, at least that

	 * code knows what it's doing.

	 */

	gfp |= __GFP_NOFAIL;



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

}

EXPORT_SYMBOL(__getblk_gfp);



/*

 * Do async read-ahead on a buffer..

 */
@@ -1491,7 +1467,17 @@ struct buffer_head * 
__bread_gfp(struct block_device *bdev, sector_t block,

		   unsigned size, gfp_t gfp)

{

	struct buffer_head *bh = __getblk_gfp(bdev, block, size, gfp);

	struct buffer_head *bh;



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



	/*

	 * Prefer looping in the allocator rather than here, at least that

	 * code knows what it's doing.

	 */

	gfp |= __GFP_NOFAIL;



	bh = bdev_getblk(bdev, block, size, gfp);



	if (likely(bh) && !buffer_uptodate(bh))

		bh = __bread_slow(bh);

include/linux/buffer_head.h

+0 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block, 
			unsigned size);

struct buffer_head *bdev_getblk(struct block_device *bdev, sector_t block,

		unsigned size, gfp_t gfp);

struct buffer_head *__getblk_gfp(struct block_device *bdev, sector_t block,

				  unsigned size, gfp_t gfp);

void __brelse(struct buffer_head *);

void __bforget(struct buffer_head *);

void __breadahead(struct block_device *, sector_t block, unsigned int size);