From 7b4bec7a8b1e70ee0124268548f217d928b218c5 Mon Sep 17 00:00:00 2001
From: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Date: Tue, 14 Jul 2009 13:25:41 -0500
Subject: [PATCH] --- yaml --- r: 155600 b: refs/heads/master c:
 eedfe1c4289216af5a0a7f38e6b2c4d3f07c087f h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/9p/client.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a77c01a1f25f..12559888cfe9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a17d1720aa35623a9bef3707b36242706714bca5
+refs/heads/master: eedfe1c4289216af5a0a7f38e6b2c4d3f07c087f
diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c
index 783a41077403..787ccddb85ea 100644
--- a/trunk/net/9p/client.c
+++ b/trunk/net/9p/client.c
@@ -1098,7 +1098,6 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
 
 	if (data) {
 		memmove(data, dataptr, count);
-		data += count;
 	}
 
 	if (udata) {
@@ -1192,9 +1191,9 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid)
 
 	err = p9pdu_readf(req->rc, clnt->dotu, "wS", &ignored, ret);
 	if (err) {
-		ret = ERR_PTR(err);
 		p9pdu_dump(1, req->rc);
-		goto free_and_error;
+		p9_free_req(clnt, req);
+		goto error;
 	}
 
 	P9_DPRINTK(P9_DEBUG_9P,
@@ -1211,8 +1210,6 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid)
 	p9_free_req(clnt, req);
 	return ret;
 
-free_and_error:
-	p9_free_req(clnt, req);
 error:
 	kfree(ret);
 	return ERR_PTR(err);