aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ncpfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ncpfs/inode.c')
-rw-r--r--fs/ncpfs/inode.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 3d1e34f8a68..87484fb8d17 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -11,7 +11,6 @@
11 11
12#include <linux/module.h> 12#include <linux/module.h>
13 13
14#include <asm/system.h>
15#include <asm/uaccess.h> 14#include <asm/uaccess.h>
16#include <asm/byteorder.h> 15#include <asm/byteorder.h>
17 16
@@ -716,13 +715,11 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
716 if (!root_inode) 715 if (!root_inode)
717 goto out_disconnect; 716 goto out_disconnect;
718 DPRINTK("ncp_fill_super: root vol=%d\n", NCP_FINFO(root_inode)->volNumber); 717 DPRINTK("ncp_fill_super: root vol=%d\n", NCP_FINFO(root_inode)->volNumber);
719 sb->s_root = d_alloc_root(root_inode); 718 sb->s_root = d_make_root(root_inode);
720 if (!sb->s_root) 719 if (!sb->s_root)
721 goto out_no_root; 720 goto out_disconnect;
722 return 0; 721 return 0;
723 722
724out_no_root:
725 iput(root_inode);
726out_disconnect: 723out_disconnect:
727 ncp_lock_server(server); 724 ncp_lock_server(server);
728 ncp_disconnect(server); 725 ncp_disconnect(server);