linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Mark Brown <broonie@kernel.org>
Cc: "Eric W. Biederman" <ebiederman@twitter.com>,
	Miklos Szeredi <mszeredi@suse.cz>,
	Miklos Szeredi <miklos@szeredi.hu>,
	Thierry Reding <thierry.reding@gmail.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the userns tree
Date: Sat, 19 Oct 2013 16:47:08 -0700	[thread overview]
Message-ID: <87k3h8escj.fsf@xmission.com> (raw)
In-Reply-To: <20131019121548.GX2443@sirena.org.uk> (Mark Brown's message of "Sat, 19 Oct 2013 13:15:48 +0100")

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;
>   }
>   

  reply	other threads:[~2013-10-19 23:47 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-19 12:15 linux-next: manual merge of the userns tree Mark Brown
2013-10-19 23:47 ` Eric W. Biederman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-11-05  5:33 Stephen Rothwell
2008-11-05 11:49 ` David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k3h8escj.fsf@xmission.com \
    --to=ebiederm@xmission.com \
    --cc=broonie@kernel.org \
    --cc=ebiederman@twitter.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=mszeredi@suse.cz \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).