linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org, hch@lst.de,
	tj@kernel.org
Subject: Re: linux-next: manual merge of the vfs tree with the  tree
Date: Fri, 8 May 2009 18:50:27 +0100	[thread overview]
Message-ID: <20090508175027.GC8633@ZenIV.linux.org.uk> (raw)
In-Reply-To: <E1M2QJl-00035r-E2@pomaz-ex.szeredi.hu>

On Fri, May 08, 2009 at 03:40:49PM +0200, Miklos Szeredi wrote:
> On Fri, 8 May 2009, Stephen Rothwell wrote:
> > Today's linux-next merge of the vfs tree got a conflict in
> > fs/fuse/inode.c between commit a325f9b92273d6c64ec56167905b951b9827ec33
> > ("fuse: update fuse_conn_init() and separate out fuse_conn_kill()") from
> > the fuse tree and commit 4225d95ddb751e09da0c145b58549da95ba13e3a ("push
> > BKL down into ->put_super") from the vfs tree.
> > 
> > I fixed it up (see below - please check) and can carry the fix as
> > necessary.
> 
> The fixup looks good.
> 
> Al, would it make sense to merge the fuse tree into the vfs tree at
> some point to fix the conflict permanently?

Hmm...  Doable, of course, but I really wonder if that's the right
way to deal with this one.  The thing is, looking at the current VFS
tree I see very few places where FUSE gets called with BKL (essentially,
->get_sb(), ->remount_fs()) and ->...ioctl()).  ->remount_fs() is absolutely
locking-agnostic there and ->get_sb(), ->put_super() and ->umount_begin()
are all serialized per superblock.  And for data structures that are
not per-superblock FUSE doesn't rely on BKL in any of those, AFAICT.

If you can ACK that, we could simply leave FUSE out of all the "push
BKL down into get_sb/umount_begin/put_super/remount_fs" series.

  reply	other threads:[~2009-05-08 17:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-08  4:44 linux-next: manual merge of the vfs tree with the tree Stephen Rothwell
2009-05-08 13:40 ` Miklos Szeredi
2009-05-08 17:50   ` Al Viro [this message]
2009-05-09 16:58     ` Miklos Szeredi
2009-05-13  2:20 Stephen Rothwell
2009-05-22  1:23 Stephen Rothwell
2009-05-24 22:03 ` Frederic Weisbecker
2009-05-24 22:07   ` Christoph Hellwig
2009-05-25 17:10     ` Frederic Weisbecker
2009-05-25  6:50   ` Stephen Rothwell
2009-06-09  1:08 Stephen Rothwell
2009-06-09  6:58 ` Miklos Szeredi
2009-06-09  7:27   ` Stephen Rothwell
2012-09-24  1:45 Stephen Rothwell
2014-05-29  3:25 Stephen Rothwell
2015-06-05  5:46 mpe@ellerman.id.au

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=20090508175027.GC8633@ZenIV.linux.org.uk \
    --to=viro@zeniv.linux.org.uk \
    --cc=hch@lst.de \
    --cc=linux-next@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --cc=sfr@canb.auug.org.au \
    --cc=tj@kernel.org \
    /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).