Commit d18bee42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

fs/9p/vfs_inode.c

+3 −0
Original line number Diff line number Diff line
@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) 


	if (v9inode->qid.type != st->qid.type)

		return 0;



	if (v9inode->qid.path != st->qid.path)

		return 0;

	return 1;

}

fs/9p/vfs_inode_dotl.c

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) 


	if (v9inode->qid.type != st->qid.type)

		return 0;



	if (v9inode->qid.path != st->qid.path)

		return 0;

	return 1;

}

net/9p/client.c

+2 −3
Original line number Diff line number Diff line
@@ -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

net/9p/trans_fd.c

+3 −3
Original line number Diff line number Diff line
@@ -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_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) {

		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)

			seq_printf(m, "wfd=%u", clnt->trans_opts.fd.wfd);

			seq_printf(m, ",wfd=%u", clnt->trans_opts.fd.wfd);

	}

	return 0;

}

net/9p/trans_virtio.c

+6 −7
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ req_retry: 
		if (err == -ENOSPC) {

			chan->ring_bufs_avail = 0;

			spin_unlock_irqrestore(&chan->lock, flags);

			err = wait_event_interruptible(*chan->vc_wq,

			err = wait_event_killable(*chan->vc_wq,

						  chan->ring_bufs_avail);

			if (err  == -ERESTARTSYS)

				return err;
@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, 
		 * Other zc request to finish here

		 */

		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));

			if (err == -ERESTARTSYS)

				return err;
@@ -471,7 +471,7 @@ req_retry_pinned: 
		if (err == -ENOSPC) {

			chan->ring_bufs_avail = 0;

			spin_unlock_irqrestore(&chan->lock, flags);

			err = wait_event_interruptible(*chan->vc_wq,

			err = wait_event_killable(*chan->vc_wq,

						  chan->ring_bufs_avail);

			if (err  == -ERESTARTSYS)

				goto err_out;
@@ -489,8 +489,7 @@ req_retry_pinned: 
	virtqueue_kick(chan->vq);

	spin_unlock_irqrestore(&chan->lock, flags);

	p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n");

	err = wait_event_interruptible(*req->wq,

				       req->status >= REQ_STATUS_RCVD);

	err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD);

	/*

	 * Non kernel buffers are pinned, unpin them

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE