From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>,
Jaegeuk Kim <jaegeuk@kernel•org>
Cc: Chao Yu <chao@kernel•org>, Chao Yu <yuchao0@huawei•com>,
Christian Brauner <christian.brauner@ubuntu•com>,
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 f2fs tree
Date: Mon, 22 Feb 2021 09:50:08 +1100 [thread overview]
Message-ID: <20210222095008.07e61a30@canb.auug.org.au> (raw)
In-Reply-To: <20210215080144.73ef0ab5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2957 bytes --]
Hi all,
On Mon, 15 Feb 2021 08:01:44 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Mon, 25 Jan 2021 16:48:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the pidfd tree got a conflict in:
> >
> > fs/f2fs/file.c
> >
> > between commits:
> >
> > 19bb7075d1a9 ("f2fs: fix out-of-repair __setattr_copy()")
> > 7cf2e6173b2d ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()")
> >
> > from the f2fs tree and commit:
> >
> > 2f221d6f7b88 ("attr: handle idmapped mounts")
> > e65ce2a50cf6 ("acl: handle 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/f2fs/file.c
> > index 7db27c81d034,8f1e97e7d242..000000000000
> > --- a/fs/f2fs/file.c
> > +++ b/fs/f2fs/file.c
> > @@@ -851,9 -848,9 +852,10 @@@ static void __setattr_copy(struct user_
> > inode->i_ctime = attr->ia_ctime;
> > if (ia_valid & ATTR_MODE) {
> > umode_t mode = attr->ia_mode;
> > + kgid_t kgid = i_gid_into_mnt(mnt_userns, inode);
> >
> > - if (!in_group_p(inode->i_gid) &&
> > - !capable_wrt_inode_uidgid(inode, CAP_FSETID))
> > - if (!in_group_p(kgid) && !capable(CAP_FSETID))
> > ++ if (!in_group_p(kgid) &&
> > ++ !capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
> > mode &= ~S_ISGID;
> > set_acl_inode(inode, mode);
> > }
> > @@@ -958,14 -948,13 +961,14 @@@ int f2fs_setattr(struct user_namespace
> > spin_unlock(&F2FS_I(inode)->i_size_lock);
> > }
> >
> > - __setattr_copy(inode, attr);
> > + __setattr_copy(&init_user_ns, inode, attr);
> >
> > if (attr->ia_valid & ATTR_MODE) {
> > - err = posix_acl_chmod(inode, f2fs_get_inode_mode(inode));
> > -
> > + err = posix_acl_chmod(&init_user_ns, inode,
> > + f2fs_get_inode_mode(inode));
> > - if (err || is_inode_flag_set(inode, FI_ACL_MODE)) {
> > - inode->i_mode = F2FS_I(inode)->i_acl_mode;
> > + if (is_inode_flag_set(inode, FI_ACL_MODE)) {
> > + if (!err)
> > + inode->i_mode = F2FS_I(inode)->i_acl_mode;
> > clear_inode_flag(inode, FI_ACL_MODE);
> > }
> > }
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
>
> The fsf2 tree commits are now
>
> 17232e830afb ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()")
> 2562515f0ad7 ("f2fs: fix out-of-repair __setattr_copy()")
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 --]
next prev parent reply other threads:[~2021-02-21 22:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 5:48 linux-next: manual merge of the pidfd tree with the f2fs tree Stephen Rothwell
2021-02-14 21:01 ` Stephen Rothwell
2021-02-21 22:50 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 5:32 Stephen Rothwell
2021-02-14 20:58 ` Stephen Rothwell
2021-02-21 22:48 ` 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=20210222095008.07e61a30@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chao@kernel$(echo .)org \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=christian@brauner$(echo .)io \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=yuchao0@huawei$(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