From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>
Cc: Alessio Balsini <balsini@android•com>,
Amir Goldstein <amir73il@gmail•com>, Jens Axboe <axboe@kernel•dk>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree
Date: Tue, 26 Sep 2023 10:24:44 +1000 [thread overview]
Message-ID: <20230926102444.096ce797@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/overlayfs/file.c
between commit:
f8f29a49ec21 ("ovl: move ovl_file_accessed() to aio completion")
e57757c5d874 ("ovl: use simpler function to convert iocb to rw flags")
from the overlayfs tree and commit:
2d1b3bbc3dd5 ("ovl: disable IOCB_DIO_CALLER_COMP")
from the vfs-brauner tree.
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/overlayfs/file.c
index 05ec614f7054,693971d20280..000000000000
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@@ -398,16 -389,22 +398,22 @@@ static ssize_t ovl_write_iter(struct ki
goto out_fdput;
if (!ovl_should_sync(OVL_FS(inode->i_sb)))
- ifl &= ~(IOCB_DSYNC | IOCB_SYNC);
+ flags &= ~(IOCB_DSYNC | IOCB_SYNC);
+ /*
+ * Overlayfs doesn't support deferred completions, don't copy
+ * this property in case it is set by the issuer.
+ */
- ifl &= ~IOCB_DIO_CALLER_COMP;
++ flags &= ~IOCB_DIO_CALLER_COMP;
+
- old_cred = ovl_override_creds(file_inode(file)->i_sb);
+ old_cred = ovl_override_creds(inode->i_sb);
if (is_sync_kiocb(iocb)) {
+ rwf_t rwf = iocb_to_rw_flags(flags);
+
file_start_write(real.file);
- ret = vfs_iter_write(real.file, iter, &iocb->ki_pos,
- ovl_iocb_to_rwf(ifl));
+ ret = vfs_iter_write(real.file, iter, &iocb->ki_pos, rwf);
file_end_write(real.file);
- /* Update size */
- ovl_copyattr(inode);
+ ovl_rw_complete(iocb);
} else {
struct ovl_aio_req *aio_req;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-09-26 0:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 0:24 Stephen Rothwell [this message]
2023-09-26 5:09 ` linux-next: manual merge of the vfs-brauner tree with the overlayfs tree Amir Goldstein
2023-09-26 6:07 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-09 23:50 Stephen Rothwell
2023-10-10 0:14 ` Stephen Rothwell
2023-10-10 11:28 ` Amir Goldstein
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=20230926102444.096ce797@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amir73il@gmail$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=balsini@android$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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