From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Miklos Szeredi <miklos@szeredi•hu>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Zev Weiss <zev@bewilderbeest•net>
Subject: linux-next: manual merge of the vfs tree with the overlayfs tree
Date: Tue, 29 May 2018 11:30:35 +1000 [thread overview]
Message-ID: <20180529113025.0eb4b16d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2265 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/read_write.c
between commit:
63ea46a359b2 ("vfs: dedupe: extract helper for a single dedup")
from the overlayfs tree and commit:
227627114799 ("fs: avoid fdput() after failed fdget() in vfs_dedupe_file_range()")
from the vfs tree.
I can't see how to easily fix up this conflict, so I effectively dropped
the vfs tree change.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/read_write.c
index 4d61375a0de4,e83bd9744b5d..000000000000
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@@ -2055,21 -2021,46 +2055,20 @@@ int vfs_dedupe_file_range(struct file *
if (info->reserved) {
info->status = -EINVAL;
- } else if (!(is_admin || (dst_file->f_mode & FMODE_WRITE))) {
- info->status = -EINVAL;
- } else if (file->f_path.mnt != dst_file->f_path.mnt) {
- info->status = -EXDEV;
- } else if (S_ISDIR(dst->i_mode)) {
- info->status = -EISDIR;
- } else if (dst_file->f_op->dedupe_file_range == NULL) {
- info->status = -EINVAL;
- } else {
- deduped = dst_file->f_op->dedupe_file_range(file, off,
- len, dst_file,
- info->dest_offset);
- if (deduped == -EBADE)
- info->status = FILE_DEDUPE_RANGE_DIFFERS;
- else if (deduped < 0)
- info->status = deduped;
- else
- info->bytes_deduped += deduped;
+ goto next_loop;
}
-next_file:
- mnt_drop_write_file(dst_file);
-next_fdput:
- fdput(dst_fd);
+ deduped = vfs_dedupe_file_range_one(file, off, dst_file,
+ info->dest_offset, len);
+ if (deduped == -EBADE)
+ info->status = FILE_DEDUPE_RANGE_DIFFERS;
+ else if (deduped < 0)
+ info->status = deduped;
+ else
+ info->bytes_deduped += deduped;
+
next_loop:
+ fdput(dst_fd);
-
if (fatal_signal_pending(current))
goto out;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-05-29 1:30 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 1:30 Stephen Rothwell [this message]
2018-06-05 0:19 ` linux-next: manual merge of the vfs tree with the overlayfs tree Stephen Rothwell
2018-06-18 3:43 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-04-12 2:03 Stephen Rothwell
2018-07-10 0:22 Stephen Rothwell
2018-07-10 0:17 Stephen Rothwell
2018-07-10 15:04 ` Al Viro
2018-07-11 2:11 ` Al Viro
2018-06-19 1:21 Stephen Rothwell
2018-06-19 8:40 ` David Howells
2018-06-19 13:38 ` Miklos Szeredi
2018-06-19 1:10 Stephen Rothwell
2018-01-25 3:31 Stephen Rothwell
2018-01-25 3:39 ` Stephen Rothwell
2018-01-31 23:25 ` Stephen Rothwell
2017-11-08 23:18 Stephen Rothwell
2016-12-11 23:13 Stephen Rothwell
2016-12-11 23:08 Stephen Rothwell
2016-10-10 0:20 Stephen Rothwell
2016-07-25 0:24 Stephen Rothwell
2016-07-25 0:30 ` Al Viro
2016-07-25 8:09 ` Miklos Szeredi
2016-05-10 23:20 Stephen Rothwell
2016-05-02 0:59 Stephen Rothwell
2016-05-02 1:08 ` Al Viro
2016-05-02 1:23 ` Al Viro
2016-05-02 8:30 ` Miklos Szeredi
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=20180529113025.0eb4b16d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=viro@ZenIV$(echo .)linux.org.uk \
--cc=zev@bewilderbeest$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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