From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: <djwong@kernel.org>, <hch@lst.de>, <linux-xfs@vger.kernel.org>
Cc: <ruansy.fnst@fujitsu.com>, <dan.j.williams@intel.com>,
<david@fromorbit.com>, <linux-fsdevel@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <nvdimm@lists.linux.dev>,
<rgoldwyn@suse.de>, <viro@zeniv.linux.org.uk>,
<willy@infradead.org>
Subject: [PATCH v7 5/8] iomap: Introduce iomap_iter2 for two files
Date: Mon, 16 Aug 2021 14:03:56 +0800 [thread overview]
Message-ID: <20210816060359.1442450-6-ruansy.fnst@fujitsu.com> (raw)
In-Reply-To: <20210816060359.1442450-1-ruansy.fnst@fujitsu.com>
Some operations, such as comparing a range of data in two files under
fsdax mode, requires nested iomap_begin()/iomap_end() on two files.
Thus, we introduce iomap_iter2() to accept two iteraters to operate
action on two files.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
fs/iomap/core.c | 51 +++++++++++++++++++++++++++++++++++++++++++
include/linux/iomap.h | 2 ++
2 files changed, 53 insertions(+)
diff --git a/fs/iomap/core.c b/fs/iomap/core.c
index 89a87a1654e8..214538a25110 100644
--- a/fs/iomap/core.c
+++ b/fs/iomap/core.c
@@ -77,3 +77,54 @@ int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops)
iomap_iter_done(iter);
return 1;
}
+
+/**
+ * iomap_iter2 - iterate over a ranges in two files
+ * @iter1: the first iteration structure
+ * @iter2: the second iteration structure
+ * @ops: iomap ops provided by the file system
+ *
+ * Iterate two files once.
+ */
+int iomap_iter2(struct iomap_iter *iter1, struct iomap_iter *iter2,
+ const struct iomap_ops *ops)
+{
+ int ret;
+
+ if (iter2->iomap.length && ops->iomap_end) {
+ ret = ops->iomap_end(iter2->inode, iter2->pos, iomap_length(iter2),
+ iter2->processed > 0 ? iter2->processed : 0,
+ iter2->flags, &iter2->iomap);
+ if (ret < 0 && !iter2->processed)
+ return ret;
+ }
+
+ if (iter1->iomap.length && ops->iomap_end) {
+ ret = ops->iomap_end(iter1->inode, iter1->pos, iomap_length(iter1),
+ iter1->processed > 0 ? iter1->processed : 0,
+ iter1->flags, &iter1->iomap);
+ if (ret < 0 && !iter1->processed)
+ return ret;
+ }
+
+ trace_iomap_iter(iter1, ops, _RET_IP_);
+ ret = iomap_iter_advance(iter1);
+ if (ret <= 0)
+ return ret;
+ ret = iomap_iter_advance(iter2);
+ if (ret <= 0)
+ return ret;
+
+ ret = ops->iomap_begin(iter1->inode, iter1->pos, iter1->len, iter1->flags,
+ &iter1->iomap, &iter1->srcmap);
+ if (ret < 0)
+ return ret;
+ iomap_iter_done(iter1);
+
+ ret = ops->iomap_begin(iter2->inode, iter2->pos, iter2->len, iter2->flags,
+ &iter2->iomap, &iter2->srcmap);
+ if (ret < 0)
+ return ret;
+ iomap_iter_done(iter2);
+ return 1;
+}
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 24f8489583ca..ebef060c65cd 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -186,6 +186,8 @@ struct iomap_iter {
};
int iomap_iter(struct iomap_iter *iter, const struct iomap_ops *ops);
+int iomap_iter2(struct iomap_iter *iter, struct iomap_iter *iter2,
+ const struct iomap_ops *ops);
/**
* iomap_length - length of the current iomap iteration
--
2.32.0
next prev parent reply other threads:[~2021-08-16 6:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-16 6:03 [PATCH v7 0/8] fsdax,xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-08-16 6:03 ` [PATCH v7 1/8] fsdax: Output address in dax_iomap_pfn() and rename it Shiyang Ruan
2021-08-18 21:01 ` Dan Williams
2021-08-16 6:03 ` [PATCH v7 2/8] fsdax: Introduce dax_iomap_cow_copy() Shiyang Ruan
2021-08-19 22:35 ` Dan Williams
2021-08-20 5:59 ` ruansy.fnst
2021-08-16 6:03 ` [PATCH v7 3/8] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-08-19 22:54 ` Dan Williams
2021-08-23 12:57 ` Christoph Hellwig
2021-08-27 3:22 ` Shiyang Ruan
2021-08-27 5:00 ` Dan Williams
2021-08-27 5:26 ` Shiyang Ruan
2021-08-16 6:03 ` [PATCH v7 4/8] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero Shiyang Ruan
2021-08-20 2:39 ` Dan Williams
2021-08-27 3:23 ` Shiyang Ruan
2021-08-16 6:03 ` Shiyang Ruan [this message]
2021-08-23 12:58 ` [PATCH v7 5/8] iomap: Introduce iomap_iter2 for two files Christoph Hellwig
2021-08-16 6:03 ` [PATCH v7 6/8] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-08-23 13:16 ` Christoph Hellwig
2021-08-16 6:03 ` [PATCH v7 7/8] fsdax: Introduce dax_iomap_ops for end of reflink Shiyang Ruan
2021-08-20 3:01 ` Dan Williams
2021-08-20 6:13 ` ruansy.fnst
2021-08-20 15:18 ` Dan Williams
2021-08-23 13:02 ` Christoph Hellwig
2021-08-27 3:29 ` Shiyang Ruan
2021-08-27 5:04 ` Dan Williams
2021-08-27 5:27 ` Shiyang Ruan
2021-08-16 6:03 ` [PATCH v7 8/8] fs/xfs: Add dax dedupe support Shiyang Ruan
2021-08-20 3:08 ` Dan Williams
2021-08-27 3:36 ` Shiyang Ruan
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=20210816060359.1442450-6-ruansy.fnst@fujitsu.com \
--to=ruansy.fnst@fujitsu.com \
--cc=dan.j.williams@intel.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=rgoldwyn@suse.de \
--cc=viro@zeniv.linux.org.uk \
--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).