From c89577587c8dde8ec96b03e1754b1d0b853a4f1a Mon Sep 17 00:00:00 2001
From: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Date: Sun, 19 Jul 2009 13:41:54 -0600
Subject: [PATCH] --- yaml --- r: 157135 b: refs/heads/master c:
 02bc35672b2fdf251e264adca5407792f63191e4 h: refs/heads/master i:   157133:
 47e044d10b3d5b28c8322d6a9fada2802c0cedcd   157131:
 73e112ab3e219e4339bad15724c2da64bcd9f25c   157127:
 cef45f076bae6d00264ac54e74ca85e48a350097   157119:
 3833902f90c3a3cc7bb5083029e9d92072e2bed6 v: v3

---
 [refs]                  |  2 +-
 trunk/fs/9p/vfs_inode.c | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a872b461ec8c..e635ef3e682a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e15597ebfe00e28857185f46aba00f400480ffe
+refs/heads/master: 02bc35672b2fdf251e264adca5407792f63191e4
diff --git a/trunk/fs/9p/vfs_inode.c b/trunk/fs/9p/vfs_inode.c
index f22668afd0d6..fac30d21851f 100644
--- a/trunk/fs/9p/vfs_inode.c
+++ b/trunk/fs/9p/vfs_inode.c
@@ -344,30 +344,25 @@ v9fs_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
 
 	ret = NULL;
 	st = p9_client_stat(fid);
-	if (IS_ERR(st)) {
-		err = PTR_ERR(st);
-		st = NULL;
-		goto error;
-	}
+	if (IS_ERR(st))
+		return ERR_CAST(st);
 
 	umode = p9mode2unixmode(v9ses, st->mode);
 	ret = v9fs_get_inode(sb, umode);
 	if (IS_ERR(ret)) {
 		err = PTR_ERR(ret);
-		ret = NULL;
 		goto error;
 	}
 
 	v9fs_stat2inode(st, ret, sb);
 	ret->i_ino = v9fs_qid2ino(&st->qid);
+	p9stat_free(st);
 	kfree(st);
 	return ret;
 
 error:
+	p9stat_free(st);
 	kfree(st);
-	if (ret)
-		iput(ret);
-
 	return ERR_PTR(err);
 }