---

yaml --- r: 218962 b: refs/heads/master c: f6ac55b h: refs/heads/master v: v3
git-mirror · Oct 28, 2010 · ef232d3 · ef232d3
1 parent f63d8e6
commit ef232d3
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: b165d60145b717261a0234f989c442c2b68b6ec0
+refs/heads/master: f6ac55b6c156cebf750376dc08e06ffdade82717
diff --git 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;