linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1851 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/overlayfs/super.c

between commit:

  1e97d6e67406 ("ovl: Move xattr support to new xattrs.c file")

from the overlayfs tree and commit:

  3f644c1cd7b5 ("overlayfs: move xattr tables to .rodata")

from the vfs-brauner tree.

I fixed it up (I used the former version of this file and applied the
following merge fix patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Oct 2023 10:47:16 +1100
Subject: [PATCH] fix up for "ovl: Move xattr support to new xattrs.c file"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/overlayfs/xattrs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c
index 1b16b0abdf91..8a9c76adbf5c 100644
--- a/fs/overlayfs/xattrs.c
+++ b/fs/overlayfs/xattrs.c
@@ -251,13 +251,13 @@ static const struct xattr_handler ovl_other_xattr_handler = {
 	.set = ovl_other_xattr_set,
 };
 
-static const struct xattr_handler *ovl_trusted_xattr_handlers[] = {
+static const struct xattr_handler * const ovl_trusted_xattr_handlers[] = {
 	&ovl_own_trusted_xattr_handler,
 	&ovl_other_xattr_handler,
 	NULL
 };
 
-static const struct xattr_handler *ovl_user_xattr_handlers[] = {
+static const struct xattr_handler * const ovl_user_xattr_handlers[] = {
 	&ovl_own_user_xattr_handler,
 	&ovl_other_xattr_handler,
 	NULL
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2874 bytes --]

Hi all,

On Tue, 10 Oct 2023 10:50:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/overlayfs/super.c
> 
> between commit:
> 
>   1e97d6e67406 ("ovl: Move xattr support to new xattrs.c file")
> 
> from the overlayfs tree and commit:
> 
>   3f644c1cd7b5 ("overlayfs: move xattr tables to .rodata")
> 
> from the vfs-brauner tree.
> 
> I fixed it up (I used the former version of this file and applied the
> following merge fix patch) 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.

Actually needs this:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Oct 2023 10:47:16 +1100
Subject: [PATCH] fix up for "ovl: Move xattr support to new xattrs.c file"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/overlayfs/overlayfs.h | 2 +-
 fs/overlayfs/xattrs.c    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 620d89ba4b6e..ca88b2636a57 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -864,7 +864,7 @@ static inline bool ovl_force_readonly(struct ovl_fs *ofs)
 
 /* xattr.c */
 
-const struct xattr_handler **ovl_xattr_handlers(struct ovl_fs *ofs);
+const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs);
 int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
 		struct iattr *attr);
 int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,
diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c
index 1b16b0abdf91..383978e4663c 100644
--- a/fs/overlayfs/xattrs.c
+++ b/fs/overlayfs/xattrs.c
@@ -251,19 +251,19 @@ static const struct xattr_handler ovl_other_xattr_handler = {
 	.set = ovl_other_xattr_set,
 };
 
-static const struct xattr_handler *ovl_trusted_xattr_handlers[] = {
+static const struct xattr_handler * const ovl_trusted_xattr_handlers[] = {
 	&ovl_own_trusted_xattr_handler,
 	&ovl_other_xattr_handler,
 	NULL
 };
 
-static const struct xattr_handler *ovl_user_xattr_handlers[] = {
+static const struct xattr_handler * const ovl_user_xattr_handlers[] = {
 	&ovl_own_user_xattr_handler,
 	&ovl_other_xattr_handler,
 	NULL
 };
 
-const struct xattr_handler **ovl_xattr_handlers(struct ovl_fs *ofs)
+const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs)
 {
 	return ofs->config.userxattr ? ovl_user_xattr_handlers :
 		ovl_trusted_xattr_handlers;
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

[Amir Goldstein]

On Tue, Oct 10, 2023 at 3:14 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Tue, 10 Oct 2023 10:50:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the vfs-brauner tree got a conflict in:
> >
> >   fs/overlayfs/super.c
> >
> > between commit:
> >
> >   1e97d6e67406 ("ovl: Move xattr support to new xattrs.c file")
> >
> > from the overlayfs tree and commit:
> >
> >   3f644c1cd7b5 ("overlayfs: move xattr tables to .rodata")
> >

Doh! I should've notice that when I acked the constify patch.

> > from the vfs-brauner tree.
> >
> > I fixed it up (I used the former version of this file and applied the
> > following merge fix patch) 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.
>
> Actually needs this:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Oct 2023 10:47:16 +1100
> Subject: [PATCH] fix up for "ovl: Move xattr support to new xattrs.c file"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/overlayfs/overlayfs.h | 2 +-
>  fs/overlayfs/xattrs.c    | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
> index 620d89ba4b6e..ca88b2636a57 100644
> --- a/fs/overlayfs/overlayfs.h
> +++ b/fs/overlayfs/overlayfs.h
> @@ -864,7 +864,7 @@ static inline bool ovl_force_readonly(struct ovl_fs *ofs)
>
>  /* xattr.c */
>
> -const struct xattr_handler **ovl_xattr_handlers(struct ovl_fs *ofs);
> +const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs);
>  int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
>                 struct iattr *attr);
>  int ovl_getattr(struct mnt_idmap *idmap, const struct path *path,
> diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c
> index 1b16b0abdf91..383978e4663c 100644
> --- a/fs/overlayfs/xattrs.c
> +++ b/fs/overlayfs/xattrs.c
> @@ -251,19 +251,19 @@ static const struct xattr_handler ovl_other_xattr_handler = {
>         .set = ovl_other_xattr_set,
>  };
>
> -static const struct xattr_handler *ovl_trusted_xattr_handlers[] = {
> +static const struct xattr_handler * const ovl_trusted_xattr_handlers[] = {
>         &ovl_own_trusted_xattr_handler,
>         &ovl_other_xattr_handler,
>         NULL
>  };
>
> -static const struct xattr_handler *ovl_user_xattr_handlers[] = {
> +static const struct xattr_handler * const ovl_user_xattr_handlers[] = {
>         &ovl_own_user_xattr_handler,
>         &ovl_other_xattr_handler,
>         NULL
>  };
>
> -const struct xattr_handler **ovl_xattr_handlers(struct ovl_fs *ofs)
> +const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs)
>  {
>         return ofs->config.userxattr ? ovl_user_xattr_handlers :
>                 ovl_trusted_xattr_handlers;
> --

I will rebase overlayfs-next over Christian's vfs.xattr branch and
squash your fix.

Thanks!
Amir.

Re: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]

Hi Amir,

On Tue, 26 Sep 2023 08:09:51 +0300 Amir Goldstein <amir73il@gmail.com> wrote:
>
> At this opportunity, I would like to ask you to add branch ovl-fixes
> from ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git
> to linux-next, because I will need to send some ovl fixes for 6.6 in
> the near future.

Added from tomorrow.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgement of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr@canb.auug.org.au

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

[Amir Goldstein]

On Tue, Sep 26, 2023 at 3:24 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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;
>


Thanks Stephen, your fix is correct.
Serves me right for doing an unnecessary var name change...
Anyway, the conflict is with vfs.fixes branch destined for 6.6,
so I will rebase overlayfs-next (for 6.7) as soon as vfs.fixes is merged.

At this opportunity, I would like to ask you to add branch ovl-fixes
from ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git
to linux-next, because I will need to send some ovl fixes for 6.6 in
the near future.

Thanks,
Amir.

linux-next: manual merge of the vfs-brauner tree with the overlayfs tree

[Stephen Rothwell]

[-- 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 --]