* linux-next: manual merge of the pidfd tree with the f2fs tree
@ 2021-01-25 5:48 Stephen Rothwell
2021-02-14 21:01 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-01-25 5:48 UTC (permalink / raw)
To: Christian Brauner, Jaegeuk Kim
Cc: Chao Yu, Chao Yu, Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2175 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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);
}
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pidfd tree with the f2fs tree
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
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-02-14 21:01 UTC (permalink / raw)
To: Christian Brauner, Jaegeuk Kim
Cc: Chao Yu, Chao Yu, Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2661 bytes --]
Hi all,
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()")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pidfd tree with the f2fs tree
2021-02-14 21:01 ` Stephen Rothwell
@ 2021-02-21 22:50 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-02-21 22:50 UTC (permalink / raw)
To: Christian Brauner, Jaegeuk Kim
Cc: Chao Yu, Chao Yu, Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- 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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the pidfd tree with the f2fs tree
@ 2021-01-25 5:32 Stephen Rothwell
2021-02-14 20:58 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-01-25 5:32 UTC (permalink / raw)
To: Christian Brauner, Jaegeuk Kim
Cc: Chao Yu, Chao Yu, Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1741 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
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)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pidfd tree with the f2fs tree
2021-01-25 5:32 Stephen Rothwell
@ 2021-02-14 20:58 ` Stephen Rothwell
2021-02-21 22:48 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-02-14 20:58 UTC (permalink / raw)
To: Christian Brauner, Jaegeuk Kim
Cc: Chao Yu, Chao Yu, Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2152 bytes --]
Hi all,
On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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()")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pidfd tree with the f2fs tree
2021-02-14 20:58 ` Stephen Rothwell
@ 2021-02-21 22:48 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-02-21 22:48 UTC (permalink / raw)
To: Christian Brauner
Cc: Jaegeuk Kim, Chao Yu, Chao Yu, Christian Brauner,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2447 bytes --]
Hi all,
On Mon, 15 Feb 2021 07:58:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-21 22:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
-- 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox