---

yaml --- r: 292323 b: refs/heads/master c: 064326c h: refs/heads/master i: 292321: de96e97 292319: d36f935 v: v3
git-mirror · Mar 21, 2012 · 2524915 · 2524915
1 parent 098f0c1
commit 2524915
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bcb4b733c22b7dbc4cf847e707ac98f751e9180
+refs/heads/master: 064326c0773af8a0e8bb82d895cceaedc8a51b9e
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
@@ -119,14 +119,14 @@ 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);
 
 	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;
 }