]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clean up the failure exits in cifs_read_super()
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 13 Feb 2012 02:06:12 +0000 (21:06 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 21 Mar 2012 01:29:33 +0000 (21:29 -0400)
no need to make that iput() conditional, just take it to the right place...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/cifs/cifsfs.c

index b1fd382d19529c798e1554b3a42ec16b36935554..8b7d7ff887927bd33442a90dfbfc1484d9c72fd9 100644 (file)
@@ -119,7 +119,6 @@ cifs_read_super(struct super_block *sb)
 
        if (IS_ERR(inode)) {
                rc = PTR_ERR(inode);
-               inode = NULL;
                goto out_no_root;
        }
 
@@ -127,6 +126,7 @@ cifs_read_super(struct super_block *sb)
 
        if (!sb->s_root) {
                rc = -ENOMEM;
+               iput(inode);
                goto out_no_root;
        }
 
@@ -147,9 +147,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;
 }