diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-22 20:17:54 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-22 20:17:54 -1000 |
| commit | d18bee424b129aa4755268feeeb1ee16cbde6afa (patch) | |
| tree | 6a35fc4eceed28dbdd828e9f641f9f3d9495262b /net/9p/trans_xen.c | |
| parent | 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c (diff) | |
| parent | 61b272c3aa170b3e461b8df636407b29f35f98eb (diff) | |
Merge branch '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull 9p filesystemfixes from Al Viro:
"Several 9p fixes"
* '9p-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
9p: Fix missing commas in mount options
net/9p: Switch to wait_event_killable()
fs/9p: Compare qid.path in v9fs_test_inode
Diffstat (limited to 'net/9p/trans_xen.c')
| -rw-r--r-- | net/9p/trans_xen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index 6ad3e043c617..325c56043007 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -156,8 +156,8 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req) ring = &priv->rings[num]; again: - while (wait_event_interruptible(ring->wq, - p9_xen_write_todo(ring, size)) != 0) + while (wait_event_killable(ring->wq, + p9_xen_write_todo(ring, size)) != 0) ; spin_lock_irqsave(&ring->lock, flags); |