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/client.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/client.c')
-rw-r--r-- | net/9p/client.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 4674235b0d9b..b433aff5ff13 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -82,7 +82,7 @@ int p9_show_client_options(struct seq_file *m, struct p9_client *clnt) { if (clnt->msize != 8192) seq_printf(m, ",msize=%u", clnt->msize); - seq_printf(m, "trans=%s", clnt->trans_mod->name); + seq_printf(m, ",trans=%s", clnt->trans_mod->name); switch (clnt->proto_version) { case p9_proto_legacy: @@ -773,8 +773,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) } again: /* 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); /* * Make sure our req is coherent with regard to updates in other |