buffer: convert sb_getblk() to call __getblk()

Matthew Wilcox (Oracle) · opsiff · commit 2650b47faa1f · 2025-07-15T21:49:57.000+08:00
mainline inclusion from mainline-v6.7-rc1 category: bugfix Now that __getblk() is in the right place in the file, it is trivial to call it from sb_getblk(). Link: https://lkml.kernel.org/r/20230914150011.843330-7-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Hui Zhu <teawater@antgroup.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit 4b9c8b1) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
@@ -362,13 +362,12 @@ static inline struct buffer_head *__getblk(struct block_device *bdev,
 	return bdev_getblk(bdev, block, size, gfp);
 }
 
-static inline struct buffer_head *
-sb_getblk(struct super_block *sb, sector_t block)
+static inline struct buffer_head *sb_getblk(struct super_block *sb,
+		sector_t block)
 {
-	return __getblk_gfp(sb->s_bdev, block, sb->s_blocksize, __GFP_MOVABLE);
+	return __getblk(sb->s_bdev, block, sb->s_blocksize);
 }
 
-
 static inline struct buffer_head *
 sb_getblk_gfp(struct super_block *sb, sector_t block, gfp_t gfp)
 {

Original file line number	Diff line number	Diff line change
`@@ -362,13 +362,12 @@ static inline struct buffer_head __getblk(struct block_device bdev,`
`362`	`362`	`return bdev_getblk(bdev, block, size, gfp);`
`363`	`363`	`}`
`364`	`364`
`365`		`-static inline struct buffer_head *`
`366`		`-sb_getblk(struct super_block *sb, sector_t block)`
	`365`	`+static inline struct buffer_head sb_getblk(struct super_block sb,`
	`366`	`+ sector_t block)`
`367`	`367`	`{`
`368`		`- return __getblk_gfp(sb->s_bdev, block, sb->s_blocksize, __GFP_MOVABLE);`
	`368`	`+ return __getblk(sb->s_bdev, block, sb->s_blocksize);`
`369`	`369`	`}`
`370`	`370`
`371`		`-`
`372`	`371`	`static inline struct buffer_head *`
`373`	`372`	`sb_getblk_gfp(struct super_block *sb, sector_t block, gfp_t gfp)`
`374`	`373`	`{`