From 2524915f208f86efe9bc3cefbd5a07e51ccf2ff1 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 12 Feb 2012 21:06:12 -0500 Subject: [PATCH] --- yaml --- r: 292323 b: refs/heads/master c: 064326c0773af8a0e8bb82d895cceaedc8a51b9e h: refs/heads/master i: 292321: de96e97ad5f34e331b8c1e650d571f163c8f85d6 292319: d36f935c6c3efe92013b7332cb1b5f46f850a695 v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsfs.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 22867dcc9c50..94bbfdea36ed 100644 --- 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 index b1fd382d1952..8b7d7ff88792 100644 --- a/trunk/fs/cifs/cifsfs.c +++ b/trunk/fs/cifs/cifsfs.c @@ -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; }