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@xxxxxxxxxxxxxxxx
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)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
