From cb112f39ecc4d908f256bb9d98d90e662258e9ab Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 17 Mar 2012 02:37:05 -0400 Subject: [PATCH] --- yaml --- r: 292357 b: refs/heads/master c: 2226a288fac462ebc98e40da007842f92a7e4799 h: refs/heads/master i: 292355: 7676855b54cb204321c37dc0d3d600fe24fea8c2 v: v3 --- [refs] | 2 +- trunk/fs/9p/v9fs.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 61c6335122b0..dfdcc04819d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01e0fe0b10d8673554525984947cc5de21492462 +refs/heads/master: 2226a288fac462ebc98e40da007842f92a7e4799 diff --git a/trunk/fs/9p/v9fs.c b/trunk/fs/9p/v9fs.c index 1964f98e74be..b85efa773949 100644 --- a/trunk/fs/9p/v9fs.c +++ b/trunk/fs/9p/v9fs.c @@ -594,21 +594,21 @@ static int __init init_v9fs(void) int err; pr_info("Installing v9fs 9p2000 file system support\n"); /* TODO: Setup list of registered trasnport modules */ - err = register_filesystem(&v9fs_fs_type); - if (err < 0) { - pr_err("Failed to register filesystem\n"); - return err; - } err = v9fs_cache_register(); if (err < 0) { pr_err("Failed to register v9fs for caching\n"); - goto out_fs_unreg; + return err; } err = v9fs_sysfs_init(); if (err < 0) { pr_err("Failed to register with sysfs\n"); + goto out_cache; + } + err = register_filesystem(&v9fs_fs_type); + if (err < 0) { + pr_err("Failed to register filesystem\n"); goto out_sysfs_cleanup; } @@ -617,8 +617,8 @@ static int __init init_v9fs(void) out_sysfs_cleanup: v9fs_sysfs_cleanup(); -out_fs_unreg: - unregister_filesystem(&v9fs_fs_type); +out_cache: + v9fs_cache_unregister(); return err; }