2 files changed, 5 insertions, 3 deletions

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 22f7ccd58d38..0f628041e3f7 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -460,8 +460,10 @@ static int __init init_v9fs(void)
 
         ret = v9fs_mux_global_init();
         if (!ret)
-                ret = register_filesystem(&v9fs_fs_type);
-
+                return ret;
+        ret = register_filesystem(&v9fs_fs_type);
+        if (!ret)
+                v9fs_mux_global_exit();
         return ret;
 }
 
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 7a7ec2d1d2f4..5241c600ce28 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -233,7 +233,7 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode)
                         inode->i_op = &v9fs_symlink_inode_operations;
                         break;
                 case S_IFDIR:
-                        inode->i_nlink++;
+                        inc_nlink(inode);
                         if(v9ses->extended)
                                 inode->i_op = &v9fs_dir_inode_operations_ext;
                         else