Linux-BTRFS Archive on lore.kernel.org
 help / color / Atom feed
From: Matthew Wilcox <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org,
	linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com,
	ocfs2-devel@oss.oracle.com, linux-xfs@vger.kernel.org,
	William Kucharski <william.kucharski@oracle.com>,
	Eric Biggers <ebiggers@google.com>, Chao Yu <yuchao0@huawei.com>,
	Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH v11 23/25] f2fs: Pass the inode to f2fs_mpage_readpages
Date: Tue, 14 Apr 2020 08:02:31 -0700
Message-ID: <20200414150233.24495-24-willy@infradead.org> (raw)
In-Reply-To: <20200414150233.24495-1-willy@infradead.org>

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

This function now only uses the mapping argument to look up the inode,
and both callers already have the inode, so just pass the inode instead
of the mapping.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Acked-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
 fs/f2fs/data.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 5b72945bf9f1..03ec97f28235 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2177,12 +2177,11 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
  * use ->readpage() or do the necessary surgery to decouple ->readpages()
  * from read-ahead.
  */
-static int f2fs_mpage_readpages(struct address_space *mapping,
+static int f2fs_mpage_readpages(struct inode *inode,
 		struct readahead_control *rac, struct page *page)
 {
 	struct bio *bio = NULL;
 	sector_t last_block_in_bio = 0;
-	struct inode *inode = mapping->host;
 	struct f2fs_map_blocks map;
 #ifdef CONFIG_F2FS_FS_COMPRESSION
 	struct compress_ctx cc = {
@@ -2294,7 +2293,7 @@ static int f2fs_read_data_page(struct file *file, struct page *page)
 	if (f2fs_has_inline_data(inode))
 		ret = f2fs_read_inline_data(inode, page);
 	if (ret == -EAGAIN)
-		ret = f2fs_mpage_readpages(page_file_mapping(page), NULL, page);
+		ret = f2fs_mpage_readpages(inode, NULL, page);
 	return ret;
 }
 
@@ -2311,7 +2310,7 @@ static void f2fs_readahead(struct readahead_control *rac)
 	if (f2fs_has_inline_data(inode))
 		return;
 
-	f2fs_mpage_readpages(rac->mapping, rac, NULL);
+	f2fs_mpage_readpages(inode, rac, NULL);
 }
 
 int f2fs_encrypt_one_page(struct f2fs_io_info *fio)
-- 
2.25.1


  parent reply index

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-14 15:02 [PATCH v11 00/25] Change readahead API Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 01/25] mm: Move readahead prototypes from mm.h Matthew Wilcox
2020-04-15  9:10   ` Johannes Thumshirn
2020-04-14 15:02 ` [PATCH v11 02/25] mm: Return void from various readahead functions Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 03/25] mm: Ignore return value of ->readpages Matthew Wilcox
2020-04-15  9:17   ` Johannes Thumshirn
2020-04-14 15:02 ` [PATCH v11 04/25] mm: Move readahead nr_pages check into read_pages Matthew Wilcox
2020-04-15  9:19   ` Johannes Thumshirn
2020-04-14 15:02 ` [PATCH v11 05/25] mm: Add new readahead_control API Matthew Wilcox
2020-04-15  1:17   ` Andrew Morton
2020-04-15  2:18     ` Matthew Wilcox
2020-04-15  4:56       ` Andrew Morton
2020-04-15 11:22         ` Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 06/25] mm: Use readahead_control to pass arguments Matthew Wilcox
2020-04-15  9:30   ` Johannes Thumshirn
2020-04-14 15:02 ` [PATCH v11 07/25] mm: Rename various 'offset' parameters to 'index' Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 08/25] mm: rename readahead loop variable to 'i' Matthew Wilcox
2020-04-15  9:31   ` Johannes Thumshirn
2020-04-14 15:02 ` [PATCH v11 09/25] mm: Remove 'page_offset' from readahead loop Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 10/25] mm: Put readahead pages in cache earlier Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 11/25] mm: Add readahead address space operation Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 12/25] mm: Move end_index check out of readahead loop Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 13/25] mm: Add page_cache_readahead_unbounded Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 14/25] mm: Document why we don't set PageReadahead Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 15/25] mm: Use memalloc_nofs_save in readahead path Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 16/25] fs: Convert mpage_readpages to mpage_readahead Matthew Wilcox
2020-06-16 22:36   ` [Cluster-devel] " Andreas Gruenbacher
2020-06-17  0:32     ` Matthew Wilcox
2020-06-17  0:57       ` Andreas Grünbacher
2020-06-17  2:21         ` Matthew Wilcox
2020-06-18 12:46           ` Andreas Gruenbacher
2020-06-18 15:03             ` Matthew Wilcox
2020-06-18 16:40               ` Andreas Gruenbacher
2020-04-14 15:02 ` [PATCH v11 17/25] btrfs: Convert from readpages to readahead Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 18/25] erofs: Convert uncompressed files " Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 19/25] erofs: Convert compressed " Matthew Wilcox
2020-04-21  5:42   ` Andrew Morton
2020-04-21  7:28     ` Gao Xiang
2020-04-14 15:02 ` [PATCH v11 20/25] ext4: Convert " Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 21/25] ext4: Pass the inode to ext4_mpage_readpages Matthew Wilcox
2020-04-14 15:02 ` [PATCH v11 22/25] f2fs: Convert from readpages to readahead Matthew Wilcox
2020-04-14 15:02 ` Matthew Wilcox [this message]
2020-04-14 15:02 ` [PATCH v11 24/25] fuse: " Matthew Wilcox
2020-04-20 11:14   ` Miklos Szeredi
2020-04-20 11:43     ` Matthew Wilcox
2020-04-20 11:54       ` Miklos Szeredi
2020-04-14 15:02 ` [PATCH v11 25/25] iomap: " Matthew Wilcox

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=20200414150233.24495-24-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=cluster-devel@redhat.com \
    --cc=ebiggers@google.com \
    --cc=jaegeuk@kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-erofs@lists.ozlabs.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=ocfs2-devel@oss.oracle.com \
    --cc=william.kucharski@oracle.com \
    --cc=yuchao0@huawei.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

Linux-BTRFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-btrfs/0 linux-btrfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-btrfs linux-btrfs/ https://lore.kernel.org/linux-btrfs \
		linux-btrfs@vger.kernel.org
	public-inbox-index linux-btrfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-btrfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git