linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <20230914150011.843330-7-willy@infradead.org> (raw)
In-Reply-To: <20230914150011.843330-1-willy@infradead.org>

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)
 {
-- 
2.40.1


  parent reply	other threads:[~2023-09-14 15:00 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-14 15:00 [PATCH v2 0/8] Add and use bdev_getblk() Matthew Wilcox (Oracle)
2023-09-14 15:00 ` [PATCH v2 1/8] buffer: Pass GFP flags to folio_alloc_buffers() Matthew Wilcox (Oracle)
2023-09-14 15:00 ` [PATCH v2 2/8] buffer: Hoist GFP flags from grow_dev_page() to __getblk_gfp() Matthew Wilcox (Oracle)
2023-09-14 15:00 ` [PATCH v2 3/8] ext4: Use bdev_getblk() to avoid memory reclaim in readahead path Matthew Wilcox (Oracle)
2023-09-14 15:00 ` [PATCH v2 4/8] buffer: " Matthew Wilcox (Oracle)
2023-09-14 15:00 ` [PATCH v2 5/8] buffer: Convert getblk_unmovable() and __getblk() to use bdev_getblk() Matthew Wilcox (Oracle)
2023-09-14 15:00 ` Matthew Wilcox (Oracle) [this message]
2023-09-14 15:00 ` [PATCH v2 7/8] ext4: Call bdev_getblk() from sb_getblk_gfp() Matthew Wilcox (Oracle)
2023-09-14 15:00 ` [PATCH v2 8/8] buffer: Remove __getblk_gfp() Matthew Wilcox (Oracle)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230914150011.843330-7-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=teawater@antgroup.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).