diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-10 12:39:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-10 12:39:11 -0400 |
commit | 622b9f152447c0fae9662446c948c8ae8f136e1c (patch) | |
tree | 071c4a2951555fbac97d12117c066530145a68e0 /net/9p/client.c | |
parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
parent | 3cd7967825a2b3926dc96ae566d986c4420919f7 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
net/9p: Handle get_user_pages_fast return properly
Diffstat (limited to 'net/9p/client.c')
-rw-r--r-- | net/9p/client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 77367745be9b..a9aa2dd66482 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
@@ -614,7 +614,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) | |||
614 | 614 | ||
615 | err = c->trans_mod->request(c, req); | 615 | err = c->trans_mod->request(c, req); |
616 | if (err < 0) { | 616 | if (err < 0) { |
617 | if (err != -ERESTARTSYS) | 617 | if (err != -ERESTARTSYS && err != -EFAULT) |
618 | c->status = Disconnected; | 618 | c->status = Disconnected; |
619 | goto reterr; | 619 | goto reterr; |
620 | } | 620 | } |