From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <christian@brauner.io>, linux-xfs@vger.kernel.org
Cc: "Darrick J. Wong" <djwong@kernel.org>,
David Chinner <david@fromorbit.com>,
Christian Brauner <christian.brauner@ubuntu.com>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pidfd tree with the xfs tree
Date: Mon, 22 Feb 2021 09:53:43 +1100 [thread overview]
Message-ID: <20210222095343.21b5a367@canb.auug.org.au> (raw)
In-Reply-To: <20210215084243.6e22abeb@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2316 bytes --]
Hi all,
On Mon, 15 Feb 2021 08:42:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 27 Jan 2021 11:24:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Today's linux-next merge of the pidfd tree got a conflict in:
> > >
> > > fs/xfs/xfs_inode.c
> > >
> > > between commit:
> > >
> > > 01ea173e103e ("xfs: fix up non-directory creation in SGID directories")
> > >
> > > from the xfs tree and commit:
> > >
> > > f736d93d76d3 ("xfs: support idmapped mounts")
> > >
> > > from the pidfd 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.
> > >
> > > diff --cc fs/xfs/xfs_inode.c
> > > index e2a1db4cee43,95b7f2ba4e06..000000000000
> > > --- a/fs/xfs/xfs_inode.c
> > > +++ b/fs/xfs/xfs_inode.c
> > > @@@ -809,13 -810,13 +810,13 @@@ xfs_init_new_inode
> > > inode->i_rdev = rdev;
> > > ip->i_d.di_projid = prid;
> > >
> > > - if (pip && XFS_INHERIT_GID(pip)) {
> > > - inode->i_gid = VFS_I(pip)->i_gid;
> > > - if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))
> > > - inode->i_mode |= S_ISGID;
> > > + if (dir && !(dir->i_mode & S_ISGID) &&
> > > + (mp->m_flags & XFS_MOUNT_GRPID)) {
> > > + inode->i_uid = current_fsuid();
> >
> > Looking a bit harder, I replaced the above line with
> > inode->i_uid = fsuid_into_mnt(mnt_userns);
> >
> > > + inode->i_gid = dir->i_gid;
> > > + inode->i_mode = mode;
> > > } else {
> > > - inode_init_owner(inode, dir, mode);
> > > - inode->i_gid = fsgid_into_mnt(mnt_userns);
> > > ++ inode_init_owner(mnt_userns, inode, dir, mode);
> > > }
> > >
> > > /*
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
This is now a conflict between the pidfd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2021-02-21 22:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 6:14 linux-next: manual merge of the pidfd tree with the xfs tree Stephen Rothwell
2021-01-27 0:24 ` Stephen Rothwell
2021-01-27 3:11 ` Darrick J. Wong
2021-01-27 9:17 ` Christian Brauner
2021-02-14 21:42 ` Stephen Rothwell
2021-02-21 22:53 ` Stephen Rothwell [this message]
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=20210222095343.21b5a367@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.brauner@ubuntu.com \
--cc=christian@brauner.io \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@vger.kernel.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).