diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-09-06 17:59:08 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-02-13 21:32:10 +0300 |
| commit | 78124e9bcc8c39afbcda2f0500b868dd0b159d40 (patch) | |
| tree | 90807895b8a2d13a48e7fd22467f5fae79ebcc1f /net/9p/client.c | |
| parent | c37e33929cfaadca634e23e502a8db358ab1babb (diff) | |
| download | linux-78124e9bcc8c39afbcda2f0500b868dd0b159d40.tar.xz | |
net/9p: Switch to wait_event_killable()
commit 9523feac272ccad2ad8186ba4fcc89103754de52 upstream.
Because userspace gets Very Unhappy when calls like stat() and execve()
return -EINTR on 9p filesystem mounts. For instance, when bash is
looking in PATH for things to execute and some SIGCHLD interrupts
stat(), bash can throw a spurious 'command not found' since it doesn't
retry the stat().
In practice, hitting the problem is rare and needs a really
slow/bogged down 9p server.
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
[bwh: Backported to 3.2:
- Drop changes in trans_xen.c
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/9p/client.c')
| -rw-r--r-- | net/9p/client.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 87173bb26410..3e61ba193bd9 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -740,8 +740,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) goto reterr; } /* Wait for the response */ - err = wait_event_interruptible(*req->wq, - req->status >= REQ_STATUS_RCVD); + err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); if (req->status == REQ_STATUS_ERROR) { P9_DPRINTK(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err); |