diff options
| author |   Matthew Wilcox (Oracle) <willy@infradead.org> | 2023-09-14 16:00:10 +0100 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2023-10-04 10:32:29 -0700 |
| commit | 8a83ac54940d27b8f56d766e1cb270d150fedd50 (patch) | |
| tree | 287e95004915d408a34b57d25a140a7807b3a73f /include/linux/buffer_head.h | |
| parent | buffer: convert sb_getblk() to call __getblk() (diff) | |
| download | wireguard-linux-8a83ac54940d27b8f56d766e1cb270d150fedd50.tar.xz wireguard-linux-8a83ac54940d27b8f56d766e1cb270d150fedd50.zip | |
ext4: call bdev_getblk() from sb_getblk_gfp()
Most of the callers of sb_getblk_gfp() already assumed that they were
passing the entire GFP flags to use. Fix up the two callers that didn't,
and remove the __GFP_NOFAIL from them since they both appear to correctly
handle failure.
Link: https://lkml.kernel.org/r/20230914150011.843330-8-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>
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index b294e2cccbae..22f13eece719 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -368,10 +368,10 @@ static inline struct buffer_head *sb_getblk(struct super_block *sb, 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) +static inline struct buffer_head *sb_getblk_gfp(struct super_block *sb, + sector_t block, gfp_t gfp) { - return __getblk_gfp(sb->s_bdev, block, sb->s_blocksize, gfp); + return bdev_getblk(sb->s_bdev, block, sb->s_blocksize, gfp); } static inline struct buffer_head * |