From: Shiyang Ruan <ruansy.fnst@fujitsu.com>
To: <linux-kernel@vger.kernel.org>, <linux-xfs@vger.kernel.org>,
<linux-nvdimm@lists.01.org>, <linux-fsdevel@vger.kernel.org>
Cc: <darrick.wong@oracle.com>, <dan.j.williams@intel.com>,
<willy@infradead.org>, <jack@suse.cz>, <viro@zeniv.linux.org.uk>,
<linux-btrfs@vger.kernel.org>, <ocfs2-devel@oss.oracle.com>,
<david@fromorbit.com>, <hch@lst.de>, <rgoldwyn@suse.de>
Subject: [RESEND PATCH v2.1 07/10] iomap: Introduce iomap_apply2() for operations on two files
Date: Thu, 4 Mar 2021 13:41:42 +0800 [thread overview]
Message-ID: <20210304054142.1147895-1-ruansy.fnst@fujitsu.com> (raw)
In-Reply-To: <20210226002030.653855-8-ruansy.fnst@fujitsu.com>
Some operations, such as comparing a range of data in two files under
fsdax mode, requires nested iomap_open()/iomap_end() on two file. Thus,
we introduce iomap_apply2() to accept arguments from two files and
iomap_actor2_t for actions on two files.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
fs/iomap/apply.c | 56 +++++++++++++++++++++++++++++++++++++++++++
include/linux/iomap.h | 7 +++++-
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/fs/iomap/apply.c b/fs/iomap/apply.c
index 26ab6563181f..fbc38ce3d5b6 100644
--- a/fs/iomap/apply.c
+++ b/fs/iomap/apply.c
@@ -97,3 +97,59 @@ iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags,
return written ? written : ret;
}
+
+loff_t
+iomap_apply2(struct inode *ino1, loff_t pos1, struct inode *ino2, loff_t pos2,
+ loff_t length, unsigned int flags, const struct iomap_ops *ops,
+ void *data, iomap_actor2_t actor)
+{
+ struct iomap smap = { .type = IOMAP_HOLE };
+ struct iomap dmap = { .type = IOMAP_HOLE };
+ loff_t written = 0, ret, ret2 = 0;
+ loff_t len1 = length, len2, min_len;
+
+ ret = ops->iomap_begin(ino1, pos1, len1, flags, &smap, NULL);
+ if (ret)
+ goto out_src;
+ if (WARN_ON(smap.offset > pos1)) {
+ written = -EIO;
+ goto out_src;
+ }
+ if (WARN_ON(smap.length == 0)) {
+ written = -EIO;
+ goto out_src;
+ }
+ len2 = min_t(loff_t, len1, smap.length);
+
+ ret = ops->iomap_begin(ino2, pos2, len2, flags, &dmap, NULL);
+ if (ret)
+ goto out_dest;
+ if (WARN_ON(dmap.offset > pos2)) {
+ written = -EIO;
+ goto out_dest;
+ }
+ if (WARN_ON(dmap.length == 0)) {
+ written = -EIO;
+ goto out_dest;
+ }
+ min_len = min_t(loff_t, len2, dmap.length);
+
+ written = actor(ino1, pos1, ino2, pos2, min_len, data, &smap, &dmap);
+
+out_dest:
+ if (ops->iomap_end)
+ ret2 = ops->iomap_end(ino2, pos2, len2,
+ written > 0 ? written : 0, flags, &dmap);
+out_src:
+ if (ops->iomap_end)
+ ret = ops->iomap_end(ino1, pos1, len1,
+ written > 0 ? written : 0, flags, &smap);
+
+ if (ret)
+ return written ? written : ret;
+
+ if (ret2)
+ return written ? written : ret2;
+
+ return written;
+}
diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 5bd3cac4df9c..913f98897a77 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -148,10 +148,15 @@ struct iomap_ops {
*/
typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len,
void *data, struct iomap *iomap, struct iomap *srcmap);
-
+typedef loff_t (*iomap_actor2_t)(struct inode *ino1, loff_t pos1,
+ struct inode *ino2, loff_t pos2, loff_t len, void *data,
+ struct iomap *smap, struct iomap *dmap);
loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length,
unsigned flags, const struct iomap_ops *ops, void *data,
iomap_actor_t actor);
+loff_t iomap_apply2(struct inode *ino1, loff_t pos1, struct inode *ino2,
+ loff_t pos2, loff_t length, unsigned int flags,
+ const struct iomap_ops *ops, void *data, iomap_actor2_t actor);
ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from,
const struct iomap_ops *ops);
--
2.30.1
next prev parent reply other threads:[~2021-03-04 5:48 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-26 0:20 [PATCH v2 00/10] fsdax,xfs: Add reflink&dedupe support for fsdax Shiyang Ruan
2021-02-26 0:20 ` [PATCH v2 01/10] fsdax: Factor helpers to simplify dax fault code Shiyang Ruan
2021-03-03 9:13 ` Christoph Hellwig
2021-02-26 0:20 ` [PATCH v2 02/10] fsdax: Factor helper: dax_fault_actor() Shiyang Ruan
2021-03-03 9:28 ` Christoph Hellwig
2021-03-12 9:01 ` ruansy.fnst
2021-02-26 0:20 ` [PATCH v2 03/10] fsdax: Output address in dax_iomap_pfn() and rename it Shiyang Ruan
2021-02-26 0:20 ` [PATCH v2 04/10] fsdax: Introduce dax_iomap_cow_copy() Shiyang Ruan
2021-03-03 9:29 ` Christoph Hellwig
2021-02-26 0:20 ` [PATCH v2 05/10] fsdax: Replace mmap entry in case of CoW Shiyang Ruan
2021-03-03 9:30 ` Christoph Hellwig
2021-03-03 9:41 ` ruansy.fnst
2021-03-03 9:44 ` Christoph Hellwig
2021-03-03 9:48 ` Christoph Hellwig
2021-02-26 0:20 ` [PATCH v2 06/10] fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero Shiyang Ruan
2021-03-03 9:31 ` Christoph Hellwig
2021-02-26 0:20 ` [PATCH v2 07/10] iomap: Introduce iomap_apply2() for operations on two files Shiyang Ruan
2021-02-26 4:14 ` Darrick J. Wong
2021-02-26 8:11 ` ruansy.fnst
2021-02-26 8:25 ` Shiyang Ruan
2021-03-04 5:41 ` Shiyang Ruan [this message]
2021-03-11 12:30 ` [RESEND PATCH v2.1 " Christoph Hellwig
2021-02-26 0:20 ` [PATCH v2 08/10] fsdax: Dedup file range to use a compare function Shiyang Ruan
2021-02-26 8:28 ` Shiyang Ruan
2021-03-03 8:20 ` Joe Perches
2021-03-04 5:42 ` [RESEND PATCH v2.1 " Shiyang Ruan
2021-02-26 0:20 ` [PATCH v2 09/10] fs/xfs: Handle CoW for fsdax write() path Shiyang Ruan
2021-03-03 9:43 ` Christoph Hellwig
2021-03-03 9:57 ` ruansy.fnst
2021-03-03 10:43 ` Christoph Hellwig
2021-03-04 1:35 ` ruansy.fnst
2021-02-26 0:20 ` [PATCH v2 10/10] fs/xfs: Add dedupe support for fsdax Shiyang Ruan
2021-02-26 9:45 ` Question about the "EXPERIMENTAL" tag for dax in XFS ruansy.fnst
2021-02-26 19:04 ` Darrick J. Wong
2021-02-26 19:24 ` Dan Williams
2021-02-26 20:51 ` Dave Chinner
2021-02-26 20:59 ` Dan Williams
2021-02-26 21:27 ` Dave Chinner
2021-02-26 22:41 ` Dan Williams
2021-02-27 22:36 ` Dave Chinner
2021-02-27 23:40 ` Dan Williams
2021-02-28 22:38 ` Dave Chinner
2021-03-01 20:55 ` Dan Williams
2021-03-01 22:46 ` Dave Chinner
2021-03-02 0:32 ` Dan Williams
2021-03-02 2:42 ` Dave Chinner
2021-03-02 3:33 ` Dan Williams
2021-03-02 5:38 ` Dave Chinner
2021-03-02 5:50 ` Dan Williams
2021-03-02 3:28 ` Darrick J. Wong
2021-03-02 5:41 ` Dan Williams
2021-03-02 7:57 ` Dave Chinner
2021-03-02 17:49 ` Dan Williams
2021-03-04 23:40 ` Darrick J. Wong
2021-03-01 7:26 ` Yasunori Goto
2021-03-01 21:34 ` Dan Williams
2021-03-09 6:36 ` [PATCH v2 00/10] fsdax,xfs: Add reflink&dedupe support for fsdax Xiaoguang Wang
2021-03-09 16:19 ` Goldwyn Rodrigues
2021-03-10 1:26 ` ruansy.fnst
2021-03-10 12:30 ` Neal Gompa
2021-03-10 13:02 ` Matthew Wilcox
2021-03-10 13:36 ` Neal Gompa
2021-03-10 13:55 ` Matthew Wilcox
2021-03-10 14:21 ` Goldwyn Rodrigues
2021-03-10 14:26 ` Matthew Wilcox
2021-03-10 17:04 ` Goldwyn Rodrigues
2021-03-11 0:53 ` Dan Williams
2021-03-11 8:26 ` Neal Gompa
2021-03-13 13:07 ` Adam Borowski
2021-03-13 16:24 ` Neal Gompa
2021-03-13 22:00 ` Adam Borowski
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=20210304054142.1147895-1-ruansy.fnst@fujitsu.com \
--to=ruansy.fnst@fujitsu.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--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).