diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-08 22:15:13 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:35 -0400 |
commit | 48fde701aff662559b38d9a609574068f22d00fe (patch) | |
tree | aa6b203dc671b51d58575b65eb08310ff8309b60 /fs/ncpfs | |
parent | 6b4231e2f92adbcf96fb2a3fa751d7ca0a61b21f (diff) |
switch open-coded instances of d_make_root() to new helper
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ncpfs')
-rw-r--r-- | fs/ncpfs/inode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 3d1e34f8a68e..49df0e7f8379 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
@@ -716,13 +716,11 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
716 | if (!root_inode) | 716 | if (!root_inode) |
717 | goto out_disconnect; | 717 | goto out_disconnect; |
718 | DPRINTK("ncp_fill_super: root vol=%d\n", NCP_FINFO(root_inode)->volNumber); | 718 | DPRINTK("ncp_fill_super: root vol=%d\n", NCP_FINFO(root_inode)->volNumber); |
719 | sb->s_root = d_alloc_root(root_inode); | 719 | sb->s_root = d_make_root(root_inode); |
720 | if (!sb->s_root) | 720 | if (!sb->s_root) |
721 | goto out_no_root; | 721 | goto out_disconnect; |
722 | return 0; | 722 | return 0; |
723 | 723 | ||
724 | out_no_root: | ||
725 | iput(root_inode); | ||
726 | out_disconnect: | 724 | out_disconnect: |
727 | ncp_lock_server(server); | 725 | ncp_lock_server(server); |
728 | ncp_disconnect(server); | 726 | ncp_disconnect(server); |