diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 18:22:55 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 18:22:55 -0800 |
commit | ddb360778a86bcf55d856bc15df3ebd2e77afff1 (patch) | |
tree | 3d3334f4f5e56ed4ab4c779ef1b21138299944b5 /fs/fuse | |
parent | 373da0a2a33018d560afcb2c77f8842985d79594 (diff) | |
parent | 759c361eb95964d0d786f8962224dd0d9e780e6e (diff) | |
download | linux-stable-ddb360778a86bcf55d856bc15df3ebd2e77afff1.tar.gz linux-stable-ddb360778a86bcf55d856bc15df3ebd2e77afff1.tar.bz2 linux-stable-ddb360778a86bcf55d856bc15df3ebd2e77afff1.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs/ncpfs: fix error paths and goto statements in ncp_fill_super()
configfs: register_filesystem() called too early
fuse: register_filesystem() called too early
ubifs: too early register_filesystem()
... and the same kind of leak for mqueue
procfs: fix a vfsmount longterm reference leak
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/inode.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 3e6d72756479..aa83109b9431 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1138,28 +1138,28 @@ static int __init fuse_fs_init(void) { int err; - err = register_filesystem(&fuse_fs_type); - if (err) - goto out; - - err = register_fuseblk(); - if (err) - goto out_unreg; - fuse_inode_cachep = kmem_cache_create("fuse_inode", sizeof(struct fuse_inode), 0, SLAB_HWCACHE_ALIGN, fuse_inode_init_once); err = -ENOMEM; if (!fuse_inode_cachep) - goto out_unreg2; + goto out; + + err = register_fuseblk(); + if (err) + goto out2; + + err = register_filesystem(&fuse_fs_type); + if (err) + goto out3; return 0; - out_unreg2: + out3: unregister_fuseblk(); - out_unreg: - unregister_filesystem(&fuse_fs_type); + out2: + kmem_cache_destroy(fuse_inode_cachep); out: return err; } |