[v2,6/8] buffer: Convert sb_getblk() to call __getblk()

Message ID	20230914150011.843330-7-willy@infradead.org
State	Not Applicable
Headers	show Return-Path: <SRS0=yFA3=E6=vger.kernel.org=linux-ext4-owner@ozlabs.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: akpm@linux-foundation.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, Hui Zhu <teawater@antgroup.com>, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org Subject: [PATCH v2 6/8] buffer: Convert sb_getblk() to call __getblk() Date: Thu, 14 Sep 2023 16:00:09 +0100 Message-Id: <20230914150011.843330-7-willy@infradead.org> In-Reply-To: <20230914150011.843330-1-willy@infradead.org> References: <20230914150011.843330-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Add and use bdev_getblk() \| expand [v2,0/8] Add and use bdev_getblk() [v2,1/8] buffer: Pass GFP flags to folio_alloc_buffers() [v2,2/8] buffer: Hoist GFP flags from grow_dev_page() to __getblk_gfp() [v2,3/8] ext4: Use bdev_getblk() to avoid memory reclaim in readahead path [v2,4/8] buffer: Use bdev_getblk() to avoid memory reclaim in readahead path [v2,5/8] buffer: Convert getblk_unmovable() and __getblk() to use bdev_getblk() [v2,6/8] buffer: Convert sb_getblk() to call __getblk() [v2,7/8] ext4: Call bdev_getblk() from sb_getblk_gfp() [v2,8/8] buffer: Remove __getblk_gfp()

Message ID

20230914150011.843330-7-willy@infradead.org

State

Not Applicable

Headers

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: akpm@linux-foundation.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        Hui Zhu <teawater@antgroup.com>, linux-fsdevel@vger.kernel.org,
        linux-ext4@vger.kernel.org
Subject: [PATCH v2 6/8] buffer: Convert sb_getblk() to call __getblk()
Date: Thu, 14 Sep 2023 16:00:09 +0100
Message-Id: <20230914150011.843330-7-willy@infradead.org>
In-Reply-To: <20230914150011.843330-1-willy@infradead.org>
References: <20230914150011.843330-1-willy@infradead.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Add and use bdev_getblk() | expand

Commit Message

Matthew Wilcox Sept. 14, 2023, 3 p.m. UTC

Now that __getblk() is in the right place in the file, it is
trivial to call it from sb_getblk().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 include/linux/buffer_head.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index e92f604a423e..9ea4b6337251 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -359,13 +359,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)
 {

[v2,6/8] buffer: Convert sb_getblk() to call __getblk()

Commit Message

Patch