diff options
| -rw-r--r-- | net/9p/client.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 783a41077403..787ccddb85ea 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
| @@ -1098,7 +1098,6 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, | |||
| 1098 | 1098 | ||
| 1099 | if (data) { | 1099 | if (data) { |
| 1100 | memmove(data, dataptr, count); | 1100 | memmove(data, dataptr, count); |
| 1101 | data += count; | ||
| 1102 | } | 1101 | } |
| 1103 | 1102 | ||
| 1104 | if (udata) { | 1103 | if (udata) { |
| @@ -1192,9 +1191,9 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid) | |||
| 1192 | 1191 | ||
| 1193 | err = p9pdu_readf(req->rc, clnt->dotu, "wS", &ignored, ret); | 1192 | err = p9pdu_readf(req->rc, clnt->dotu, "wS", &ignored, ret); |
| 1194 | if (err) { | 1193 | if (err) { |
| 1195 | ret = ERR_PTR(err); | ||
| 1196 | p9pdu_dump(1, req->rc); | 1194 | p9pdu_dump(1, req->rc); |
| 1197 | goto free_and_error; | 1195 | p9_free_req(clnt, req); |
| 1196 | goto error; | ||
| 1198 | } | 1197 | } |
| 1199 | 1198 | ||
| 1200 | P9_DPRINTK(P9_DEBUG_9P, | 1199 | P9_DPRINTK(P9_DEBUG_9P, |
| @@ -1211,8 +1210,6 @@ struct p9_wstat *p9_client_stat(struct p9_fid *fid) | |||
| 1211 | p9_free_req(clnt, req); | 1210 | p9_free_req(clnt, req); |
| 1212 | return ret; | 1211 | return ret; |
| 1213 | 1212 | ||
| 1214 | free_and_error: | ||
| 1215 | p9_free_req(clnt, req); | ||
| 1216 | error: | 1213 | error: |
| 1217 | kfree(ret); | 1214 | kfree(ret); |
| 1218 | return ERR_PTR(err); | 1215 | return ERR_PTR(err); |
