Hi all,
On Mon, 15 Feb 2021 07:58:06 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the pidfd tree got a conflict in:
> >
> > fs/f2fs/acl.c
> >
> > between commit:
> >
> > 7cf2e6173b2d ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()")
> >
> > from the f2fs tree and commit:
> >
> > 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/acl.c
> > index 732ec10e7890,a19e86c9adac..000000000000
> > --- a/fs/f2fs/acl.c
> > +++ b/fs/f2fs/acl.c
> > @@@ -200,27 -200,6 +200,27 @@@ struct posix_acl *f2fs_get_acl(struct i
> > return __f2fs_get_acl(inode, type, NULL);
> > }
> >
> > +static int f2fs_acl_update_mode(struct inode *inode, umode_t *mode_p,
> > + struct posix_acl **acl)
> > +{
> > + umode_t mode = inode->i_mode;
> > + int error;
> > +
> > + if (is_inode_flag_set(inode, FI_ACL_MODE))
> > + mode = F2FS_I(inode)->i_acl_mode;
> > +
> > + error = posix_acl_equiv_mode(*acl, &mode);
> > + if (error < 0)
> > + return error;
> > + if (error == 0)
> > + *acl = NULL;
> > - if (!in_group_p(inode->i_gid) &&
> > - !capable_wrt_inode_uidgid(inode, CAP_FSETID))
> > ++ if (!in_group_p(i_gid_into_mnt(&init_user_ns, inode)) &&
> > ++ !capable_wrt_inode_uidgid(&init_user_ns, inode, CAP_FSETID))
> > + mode &= ~S_ISGID;
> > + *mode_p = mode;
> > + return 0;
> > +}
> > +
> > static int __f2fs_set_acl(struct inode *inode, int type,
> > struct posix_acl *acl, struct page *ipage)
> > {
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
>
> The f2fs tree commit is now
>
> 17232e830afb ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()")
This is now a conflict between the pidfd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgphy8smczHss.pgp
Description: OpenPGP digital signature
