Merge git://git.samba.org/sfrench/cifs-2.6

[karo-tx-linux.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index cc098ccac611821d078893ec1ca8faa95307a1e4..eee522c56ef0aa5478e7e4e5919e19082f402485 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -114,12 +114,10 @@ cifs_read_super(struct super_block *sb)
 
        if (IS_ERR(inode)) {
                rc = PTR_ERR(inode);
-               inode = NULL;
                goto out_no_root;
        }
 
-       sb->s_root = d_alloc_root(inode);
-
+       sb->s_root = d_make_root(inode);
        if (!sb->s_root) {
                rc = -ENOMEM;
                goto out_no_root;
@@ -142,9 +140,6 @@ cifs_read_super(struct super_block *sb)
 
 out_no_root:
        cERROR(1, "cifs_read_super: get root inode failed");
-       if (inode)
-               iput(inode);
-
        return rc;
 }