linux-next: manual merge of the userns tree

linux-next: manual merge of the userns tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

Hi Serge,

Today's linux-next merge of the userns tree got conflicts caused by the
creds tree that the userns tree is based on.  I excluded the creds tree
(since the conflicts were a bit complex) so I need to exclude the userns
tree as well for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the userns tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 
> Today's linux-next merge of the userns tree got conflicts caused by the
> creds tree that the userns tree is based on.  I excluded the creds tree
> (since the conflicts were a bit complex) so I need to exclude the userns
> tree as well for today.

Can you give more details?

I wonder if I need to be more proactive in getting the wrapper patches pushed
into their respective subsys trees.

David

linux-next: manual merge of the userns tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

Today's linux-next merge of the userns tree got a conflict in
fs/fuse/dir.c between 3c70b8eed (fuse: don't check_submounts_and_drop()
in RCU walk) in the fuse tree and 40216baa0 (vfs: Lazily remove mounts
on unlinked files and directories. v2) in the userns tree.

I fixed it up as below and can carry as required:

diff --cc fs/fuse/dir.c
index 0747f6e,b1cd7b7..0000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -263,9 -259,7 +263,10 @@@ out
  
  invalid:
  	ret = 0;
 -	shrink_submounts_and_drop(entry);
 +
- 	if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
- 		ret = 1;
++	if (!(flags & LOOKUP_RCU))
++		shrink_submounts_and_drop(entry);
++
  	goto out;
  }
  

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the userns tree

[Eric W. Biederman]

Mark Brown <broonie@kernel.org> writes:

> Today's linux-next merge of the userns tree got a conflict in
> fs/fuse/dir.c between 3c70b8eed (fuse: don't check_submounts_and_drop()
> in RCU walk) in the fuse tree and 40216baa0 (vfs: Lazily remove mounts
> on unlinked files and directories. v2) in the userns tree.
>
> I fixed it up as below and can carry as required:

The fix looks right.

However I think this conflict highlights a larger issue, as there are
several other filesystems that call check_submounts_and_drop from the
devalidate and possibly from rcu_walk today.

Miklos what problem did you run into?

Sigh.  It looks like it probably makes sense to merge
shrink_submounts_and_drop with d_invalidate, so filesystems don't even
need to think about this issue.

Eric

> diff --cc fs/fuse/dir.c
> index 0747f6e,b1cd7b7..0000000
> --- a/fs/fuse/dir.c
> +++ b/fs/fuse/dir.c
> @@@ -263,9 -259,7 +263,10 @@@ out
>   
>   invalid:
>   	ret = 0;
>  -	shrink_submounts_and_drop(entry);
>  +
> - 	if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
> - 		ret = 1;
> ++	if (!(flags & LOOKUP_RCU))
> ++		shrink_submounts_and_drop(entry);
> ++
>   	goto out;
>   }
>