From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>,
Miklos Szeredi <miklos@szeredi•hu>,
Amir Goldstein <amir73il@gmail•com>
Cc: Alexander Larsson <alexl@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Wedson Almeida Filho <walmeida@microsoft•com>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree
Date: Tue, 10 Oct 2023 11:14:36 +1100 [thread overview]
Message-ID: <20231010111436.46f64716@canb.auug.org.au> (raw)
In-Reply-To: <20231010105021.57fa4379@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2023-10-10 0:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 23:50 linux-next: manual merge of the vfs-brauner tree with the overlayfs tree Stephen Rothwell
2023-10-10 0:14 ` Stephen Rothwell [this message]
2023-10-10 11:28 ` Amir Goldstein
-- strict thread matches above, loose matches on Subject: below --
2023-09-26 0:24 Stephen Rothwell
2023-09-26 5:09 ` Amir Goldstein
2023-09-26 6:07 ` Stephen Rothwell
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=20231010111436.46f64716@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexl@redhat$(echo .)com \
--cc=amir73il@gmail$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=walmeida@microsoft$(echo .)com \
/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