From: Christoph Hellwig <hch@lst.de>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>,
Matthew Wilcox <willy@infradead.org>,
Andreas Gruenbacher <agruenba@redhat.com>,
Shiyang Ruan <ruansy.fnst@fujitsu.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-btrfs@vger.kernel.org, nvdimm@lists.linux.dev,
cluster-devel@redhat.com
Subject: [PATCH 02/30] iomap: remove the iomap arguments to ->page_{prepare,done}
Date: Mon, 9 Aug 2021 08:12:16 +0200 [thread overview]
Message-ID: <20210809061244.1196573-3-hch@lst.de> (raw)
In-Reply-To: <20210809061244.1196573-1-hch@lst.de>
These aren't actually used by the only instance implementing the methods.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/gfs2/bmap.c | 5 ++---
fs/iomap/buffered-io.c | 6 +++---
include/linux/iomap.h | 5 ++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index ed8b67b2171817..5414c2c3358092 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -1002,7 +1002,7 @@ static void gfs2_write_unlock(struct inode *inode)
}
static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos,
- unsigned len, struct iomap *iomap)
+ unsigned len)
{
unsigned int blockmask = i_blocksize(inode) - 1;
struct gfs2_sbd *sdp = GFS2_SB(inode);
@@ -1013,8 +1013,7 @@ static int gfs2_iomap_page_prepare(struct inode *inode, loff_t pos,
}
static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,
- unsigned copied, struct page *page,
- struct iomap *iomap)
+ unsigned copied, struct page *page)
{
struct gfs2_trans *tr = current->journal_info;
struct gfs2_inode *ip = GFS2_I(inode);
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 586d9d078ce10e..8a7746433bc719 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -615,7 +615,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
return -EINTR;
if (page_ops && page_ops->page_prepare) {
- status = page_ops->page_prepare(inode, pos, len, iomap);
+ status = page_ops->page_prepare(inode, pos, len);
if (status)
return status;
}
@@ -648,7 +648,7 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
out_no_page:
if (page_ops && page_ops->page_done)
- page_ops->page_done(inode, pos, 0, NULL, iomap);
+ page_ops->page_done(inode, pos, 0, NULL);
return status;
}
@@ -724,7 +724,7 @@ static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t len,
if (old_size < pos)
pagecache_isize_extended(inode, old_size, pos);
if (page_ops && page_ops->page_done)
- page_ops->page_done(inode, pos, ret, page, iomap);
+ page_ops->page_done(inode, pos, ret, page);
put_page(page);
if (ret < len)
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index b8ec145b2975c1..72696a55c137f1 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -126,10 +126,9 @@ static inline bool iomap_inline_data_valid(struct iomap *iomap)
* associated page could not be obtained.
*/
struct iomap_page_ops {
- int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len,
- struct iomap *iomap);
+ int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len);
void (*page_done)(struct inode *inode, loff_t pos, unsigned copied,
- struct page *page, struct iomap *iomap);
+ struct page *page);
};
/*
--
2.30.2
next prev parent reply other threads:[~2021-08-09 6:15 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 6:12 switch iomap to an iterator model v2 Christoph Hellwig
2021-08-09 6:12 ` [PATCH 01/30] iomap: fix a trivial comment typo in trace.h Christoph Hellwig
2021-08-09 6:12 ` Christoph Hellwig [this message]
2021-08-09 6:12 ` [PATCH 03/30] iomap: mark the iomap argument to iomap_sector const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 04/30] iomap: mark the iomap argument to iomap_inline_data const Christoph Hellwig
2021-08-09 16:17 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 05/30] iomap: mark the iomap argument to iomap_inline_data_valid const Christoph Hellwig
2021-08-09 16:17 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 06/30] fs: mark the iomap argument to __block_write_begin_int const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 07/30] fsdax: mark the iomap argument to dax_iomap_sector as const Christoph Hellwig
2021-08-19 20:35 ` Dan Williams
2021-08-09 6:12 ` [PATCH 08/30] iomap: mark the iomap argument to iomap_read_inline_data const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 09/30] iomap: mark the iomap argument to iomap_read_page_sync const Christoph Hellwig
2021-08-09 6:12 ` [PATCH 10/30] iomap: fix the iomap_readpage_actor return value for inline data Christoph Hellwig
2021-08-10 23:31 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 11/30] iomap: add the new iomap_iter model Christoph Hellwig
2021-08-09 22:10 ` Dave Chinner
2021-08-10 6:45 ` Darrick J. Wong
2021-08-10 7:13 ` Christoph Hellwig
2021-08-11 0:31 ` Darrick J. Wong
2021-08-11 5:38 ` Christoph Hellwig
2021-08-11 19:17 ` Darrick J. Wong
2021-08-12 6:49 ` Christoph Hellwig
2021-08-12 18:20 ` Darrick J. Wong
2021-08-13 7:29 ` Christoph Hellwig
2021-08-11 19:17 ` [PATCH v2.1 " Darrick J. Wong
2021-08-17 2:34 ` Dave Chinner
2021-08-19 21:25 ` [PATCH " Dan Williams
2021-08-20 4:11 ` Christoph Hellwig
2021-08-20 15:27 ` Dan Williams
2021-08-09 6:12 ` [PATCH 12/30] iomap: switch readahead and readpage to use iomap_iter Christoph Hellwig
2021-08-10 23:46 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 13/30] iomap: switch iomap_file_buffered_write " Christoph Hellwig
2021-08-10 23:53 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 14/30] iomap: switch iomap_file_unshare " Christoph Hellwig
2021-08-10 23:54 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 15/30] iomap: switch iomap_zero_range " Christoph Hellwig
2021-08-10 23:54 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 16/30] iomap: switch iomap_page_mkwrite " Christoph Hellwig
2021-08-10 23:58 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 17/30] iomap: switch __iomap_dio_rw " Christoph Hellwig
2021-08-11 0:17 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 18/30] iomap: switch iomap_fiemap " Christoph Hellwig
2021-08-11 0:05 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 19/30] iomap: switch iomap_bmap " Christoph Hellwig
2021-08-10 6:39 ` Darrick J. Wong
2021-08-10 7:13 ` Christoph Hellwig
2021-08-11 19:18 ` [PATCH v2.1 " Darrick J. Wong
2021-08-12 6:50 ` Christoph Hellwig
2021-08-17 2:35 ` Dave Chinner
2021-08-09 6:12 ` [PATCH 20/30] iomap: switch iomap_seek_hole " Christoph Hellwig
2021-08-11 0:13 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 21/30] iomap: switch iomap_seek_data " Christoph Hellwig
2021-08-11 0:12 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 22/30] iomap: switch iomap_swapfile_activate " Christoph Hellwig
2021-08-11 0:08 ` Darrick J. Wong
2021-08-09 6:12 ` [PATCH 23/30] fsdax: switch dax_iomap_rw " Christoph Hellwig
2021-08-11 0:07 ` Darrick J. Wong
2021-08-19 21:55 ` Dan Williams
2021-08-09 6:12 ` [PATCH 24/30] iomap: remove iomap_apply Christoph Hellwig
2021-08-11 19:18 ` [PATCH v2.1 " Darrick J. Wong
2021-08-17 2:36 ` Dave Chinner
2021-08-09 6:12 ` [PATCH 25/30] iomap: pass an iomap_iter to various buffered I/O helpers Christoph Hellwig
2021-08-09 6:12 ` [PATCH 26/30] iomap: rework unshare flag Christoph Hellwig
2021-08-09 6:12 ` [PATCH 27/30] fsdax: factor out helpers to simplify the dax fault code Christoph Hellwig
2021-08-09 6:12 ` [PATCH 28/30] fsdax: factor out a dax_fault_actor() helper Christoph Hellwig
2021-08-09 6:12 ` [PATCH 29/30] fsdax: switch the fault handlers to use iomap_iter Christoph Hellwig
2021-08-09 6:12 ` [PATCH 30/30] iomap: constify iomap_iter_srcmap Christoph Hellwig
2021-08-11 19:19 ` [PATCH 31/30] iomap: move iomap iteration code to iter.c Darrick J. Wong
2021-08-17 2:37 ` Dave Chinner
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=20210809061244.1196573-3-hch@lst.de \
--to=hch@lst.de \
--cc=agruenba@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=djwong@kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=ruansy.fnst@fujitsu.com \
--cc=willy@infradead.org \
/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).