diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-22 20:22:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-22 20:22:11 -0700 |
| commit | c4c53bad4095aec461ed2488534ce6c7e672228a (patch) | |
| tree | 780d8f0d1aa5239ebfbd4ae4abf709e903961c5f | |
| parent | b7dec838b5f3610c9e800249b1da10468580cd11 (diff) | |
| parent | 999b8b88c6060adf7a9b7907740ae86ace65291e (diff) | |
| download | blackbird-op-linux-c4c53bad4095aec461ed2488534ce6c7e672228a.tar.gz blackbird-op-linux-c4c53bad4095aec461ed2488534ce6c7e672228a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull 9p regression fix from Al Viro:
"Fix for breakage introduced when switching p9_client_{read,write}() to
struct iov_iter * (went into 4.1)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
9p: ensure err is initialized to 0 in p9_client_read/write
| -rw-r--r-- | net/9p/client.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 498454b3c06c..ea79ee9a7348 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1541,6 +1541,7 @@ p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err) struct p9_client *clnt = fid->clnt; struct p9_req_t *req; int total = 0; + *err = 0; p9_debug(P9_DEBUG_9P, ">>> TREAD fid %d offset %llu %d\n", fid->fid, (unsigned long long) offset, (int)iov_iter_count(to)); @@ -1620,6 +1621,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) struct p9_client *clnt = fid->clnt; struct p9_req_t *req; int total = 0; + *err = 0; p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %zd\n", fid->fid, (unsigned long long) offset, |
