From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Tejun Heo <tj@kernel.org>, Miklos Szeredi <miklos@szeredi.hu>
Subject: linux-next: manual merge of the vfs tree with the tree
Date: Fri, 8 May 2009 14:44:57 +1000 [thread overview]
Message-ID: <20090508144457.c88fc3dc.sfr@canb.auug.org.au> (raw)
Hi Al,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/fuse/inode.c
index d8673cc,31a9720..0000000
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@@ -295,17 -297,10 +298,21 @@@ void fuse_conn_kill(struct fuse_conn *f
list_del(&fc->entry);
fuse_ctl_remove_conn(fc);
mutex_unlock(&fuse_mutex);
- bdi_destroy(&fc->bdi);
+ fuse_bdi_destroy(fc);
+}
+EXPORT_SYMBOL_GPL(fuse_conn_kill);
+
+static void fuse_put_super(struct super_block *sb)
+{
+ struct fuse_conn *fc = get_fuse_conn_super(sb);
+
++ lock_kernel();
++
+ fuse_send_destroy(fc);
+ fuse_conn_kill(fc);
fuse_conn_put(fc);
+
+ unlock_kernel();
}
static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr)
next reply other threads:[~2009-05-08 4:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-08 4:44 Stephen Rothwell [this message]
2009-05-08 13:40 ` linux-next: manual merge of the vfs tree with the tree Miklos Szeredi
2009-05-08 17:50 ` Al Viro
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=20090508144457.c88fc3dc.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=tj@kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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).