lkml.org 
[lkml]   [2013]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the userns tree
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;
> }
>


\
 
 \ /
  Last update: 2013-10-20 02:01    [W:0.325 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site