From ef232d300535266b53ad8f48b39396a086bd26e1 Mon Sep 17 00:00:00 2001
From: Sanchit Garg <sancgarg@linux.vnet.ibm.com>
Date: Wed, 27 Oct 2010 09:41:01 +0530
Subject: [PATCH] --- yaml --- r: 218962 b: refs/heads/master c:
 f6ac55b6c156cebf750376dc08e06ffdade82717 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2114616a587d..24244adef205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b165d60145b717261a0234f989c442c2b68b6ec0
+refs/heads/master: f6ac55b6c156cebf750376dc08e06ffdade82717
diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c
index 8df80fb86f23..a848bca9fbff 100644
--- a/trunk/net/9p/client.c
+++ b/trunk/net/9p/client.c
@@ -1286,16 +1286,13 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
 
 	if (data) {
 		memmove(data, dataptr, count);
-	}
-
-	if (udata) {
+	} else {
 		err = copy_to_user(udata, dataptr, count);
 		if (err) {
 			err = -EFAULT;
 			goto free_and_error;
 		}
 	}
-
 	p9_free_req(clnt, req);
 	return count;