Commit d18bee42 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 0c86a6bd 61b272c3
...@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) ...@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data)
if (v9inode->qid.type != st->qid.type) if (v9inode->qid.type != st->qid.type)
return 0; return 0;
if (v9inode->qid.path != st->qid.path)
return 0;
return 1; return 1;
} }
......
...@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) ...@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data)
if (v9inode->qid.type != st->qid.type) if (v9inode->qid.type != st->qid.type)
return 0; return 0;
if (v9inode->qid.path != st->qid.path)
return 0;
return 1; return 1;
} }
......
...@@ -82,7 +82,7 @@ int p9_show_client_options(struct seq_file *m, struct p9_client *clnt) ...@@ -82,7 +82,7 @@ int p9_show_client_options(struct seq_file *m, struct p9_client *clnt)
{ {
if (clnt->msize != 8192) if (clnt->msize != 8192)
seq_printf(m, ",msize=%u", clnt->msize); 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) { switch (clnt->proto_version) {
case p9_proto_legacy: case p9_proto_legacy:
...@@ -773,8 +773,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) ...@@ -773,8 +773,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
} }
again: again:
/* Wait for the response */ /* Wait for the response */
err = wait_event_interruptible(*req->wq, err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);
req->status >= REQ_STATUS_RCVD);
/* /*
* Make sure our req is coherent with regard to updates in other * Make sure our req is coherent with regard to updates in other
......
...@@ -724,12 +724,12 @@ static int p9_fd_show_options(struct seq_file *m, struct p9_client *clnt) ...@@ -724,12 +724,12 @@ static int p9_fd_show_options(struct seq_file *m, struct p9_client *clnt)
{ {
if (clnt->trans_mod == &p9_tcp_trans) { if (clnt->trans_mod == &p9_tcp_trans) {
if (clnt->trans_opts.tcp.port != P9_PORT) if (clnt->trans_opts.tcp.port != P9_PORT)
seq_printf(m, "port=%u", clnt->trans_opts.tcp.port); seq_printf(m, ",port=%u", clnt->trans_opts.tcp.port);
} else if (clnt->trans_mod == &p9_fd_trans) { } else if (clnt->trans_mod == &p9_fd_trans) {
if (clnt->trans_opts.fd.rfd != ~0) if (clnt->trans_opts.fd.rfd != ~0)
seq_printf(m, "rfd=%u", clnt->trans_opts.fd.rfd); seq_printf(m, ",rfd=%u", clnt->trans_opts.fd.rfd);
if (clnt->trans_opts.fd.wfd != ~0) if (clnt->trans_opts.fd.wfd != ~0)
seq_printf(m, "wfd=%u", clnt->trans_opts.fd.wfd); seq_printf(m, ",wfd=%u", clnt->trans_opts.fd.wfd);
} }
return 0; return 0;
} }
......
...@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) ...@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req)
if (err == -ENOSPC) { if (err == -ENOSPC) {
chan->ring_bufs_avail = 0; chan->ring_bufs_avail = 0;
spin_unlock_irqrestore(&chan->lock, flags); spin_unlock_irqrestore(&chan->lock, flags);
err = wait_event_interruptible(*chan->vc_wq, err = wait_event_killable(*chan->vc_wq,
chan->ring_bufs_avail); chan->ring_bufs_avail);
if (err == -ERESTARTSYS) if (err == -ERESTARTSYS)
return err; return err;
...@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, ...@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
* Other zc request to finish here * Other zc request to finish here
*/ */
if (atomic_read(&vp_pinned) >= chan->p9_max_pages) { if (atomic_read(&vp_pinned) >= chan->p9_max_pages) {
err = wait_event_interruptible(vp_wq, err = wait_event_killable(vp_wq,
(atomic_read(&vp_pinned) < chan->p9_max_pages)); (atomic_read(&vp_pinned) < chan->p9_max_pages));
if (err == -ERESTARTSYS) if (err == -ERESTARTSYS)
return err; return err;
...@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, ...@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,
if (err == -ENOSPC) { if (err == -ENOSPC) {
chan->ring_bufs_avail = 0; chan->ring_bufs_avail = 0;
spin_unlock_irqrestore(&chan->lock, flags); spin_unlock_irqrestore(&chan->lock, flags);
err = wait_event_interruptible(*chan->vc_wq, err = wait_event_killable(*chan->vc_wq,
chan->ring_bufs_avail); chan->ring_bufs_avail);
if (err == -ERESTARTSYS) if (err == -ERESTARTSYS)
goto err_out; goto err_out;
...@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, ...@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req,
virtqueue_kick(chan->vq); virtqueue_kick(chan->vq);
spin_unlock_irqrestore(&chan->lock, flags); spin_unlock_irqrestore(&chan->lock, flags);
p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n"); p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n");
err = wait_event_interruptible(*req->wq, err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);
req->status >= REQ_STATUS_RCVD);
/* /*
* Non kernel buffers are pinned, unpin them * Non kernel buffers are pinned, unpin them
*/ */
......
...@@ -156,8 +156,8 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req) ...@@ -156,8 +156,8 @@ static int p9_xen_request(struct p9_client *client, struct p9_req_t *p9_req)
ring = &priv->rings[num]; ring = &priv->rings[num];
again: again:
while (wait_event_interruptible(ring->wq, while (wait_event_killable(ring->wq,
p9_xen_write_todo(ring, size)) != 0) p9_xen_write_todo(ring, size)) != 0)
; ;
spin_lock_irqsave(&ring->lock, flags); spin_lock_irqsave(&ring->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment