* linux-next: manual merge of the userns tree
@ 2008-11-05 5:33 Stephen Rothwell
2008-11-05 11:49 ` David Howells
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2008-11-05 5:33 UTC (permalink / raw)
To: Serge E. Hallyn; +Cc: linux-next, David Howells, James Morris
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the userns tree
2008-11-05 5:33 linux-next: manual merge of the userns tree Stephen Rothwell
@ 2008-11-05 11:49 ` David Howells
0 siblings, 0 replies; 4+ messages in thread
From: David Howells @ 2008-11-05 11:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: dhowells, Serge E. Hallyn, linux-next, James Morris
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the userns tree
@ 2013-10-19 12:15 Mark Brown
2013-10-19 23:47 ` Eric W. Biederman
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2013-10-19 12:15 UTC (permalink / raw)
To: Eric W. Biederman, Eric W. Biederman, Miklos Szeredi, Miklos Szeredi
Cc: Thierry Reding, linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the userns tree
2013-10-19 12:15 Mark Brown
@ 2013-10-19 23:47 ` Eric W. Biederman
0 siblings, 0 replies; 4+ messages in thread
From: Eric W. Biederman @ 2013-10-19 23:47 UTC (permalink / raw)
To: Mark Brown
Cc: Eric W. Biederman, Miklos Szeredi, Miklos Szeredi,
Thierry Reding, linux-next, linux-kernel
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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-19 23:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-05 5:33 linux-next: manual merge of the userns tree Stephen Rothwell
2008-11-05 11:49 ` David Howells
2013-10-19 12:15 Mark Brown
2013-10-19 23:47 ` Eric W. Biederman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).