Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs 

Pull 9pfs updates from Eric Van Hensbergen:
 "Some accumulated cleanup patches for kerneldoc and unused variables as
  well as some lock bug fixes and adding privateport option for RDMA"

* tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p: add a privport option for RDMA transport.
  fs/9p: Initialize status in v9fs_file_do_lock.
  net/9p: Initialize opts->privport as it should be.
  net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show()
  9p: use unsigned integers for nwqid/count
  9p: do not crash on unknown lock status code
  9p: fix error handling in v9fs_file_do_lock
  9p: remove unused variable in p9_fd_create()
  9p: kerneldoc warning fixes
parents 34a984f7 f569d3ef

fs/9p/v9fs.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ enum p9_cache_modes { 
 * @cache: cache mode of type &p9_cache_modes

 * @cachetag: the tag of the cache associated with this session

 * @fscache: session cookie associated with FS-Cache

 * @options: copy of options string given by user

 * @uname: string user name to mount hierarchy as

 * @aname: mount specifier for remote hierarchy

 * @maxdata: maximum data to be sent/recvd per protocol message

fs/9p/vfs_addr.c

+0 −2
Original line number Diff line number Diff line
@@ -231,9 +231,7 @@ static int v9fs_launder_page(struct page *page) 
/**

 * v9fs_direct_IO - 9P address space operation for direct I/O

 * @iocb: target I/O control block

 * @iov: array of vectors that define I/O buffer

 * @pos: offset in file to begin the operation

 * @nr_segs: size of iovec array

 *

 * The presence of v9fs_direct_IO() in the address space ops vector

 * allowes open() O_DIRECT flags which would have failed otherwise.

fs/9p/vfs_file.c

+6 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl) 
{

	struct p9_flock flock;

	struct p9_fid *fid;

	uint8_t status;

	uint8_t status = P9_LOCK_ERROR;

	int res = 0;

	unsigned char fl_type;
@@ -196,7 +196,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl) 
	for (;;) {

		res = p9_client_lock_dotl(fid, &flock, &status);

		if (res < 0)

			break;

			goto out_unlock;



		if (status != P9_LOCK_BLOCKED)

			break;
@@ -214,14 +214,16 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl) 
	case P9_LOCK_BLOCKED:

		res = -EAGAIN;

		break;

	default:

		WARN_ONCE(1, "unknown lock status code: %d\n", status);

		/* fallthough */

	case P9_LOCK_ERROR:

	case P9_LOCK_GRACE:

		res = -ENOLCK;

		break;

	default:

		BUG();

	}



out_unlock:

	/*

	 * incase server returned error for lock request, revert

	 * it locally

net/9p/protocol.c

+3 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ p9pdu_vreadf(struct p9_fcall *pdu, int proto_version, const char *fmt, 
			}

			break;

		case 'R':{

				int16_t *nwqid = va_arg(ap, int16_t *);

				uint16_t *nwqid = va_arg(ap, uint16_t *);

				struct p9_qid **wqids =

				    va_arg(ap, struct p9_qid **);
@@ -440,7 +440,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt, 
						 stbuf->n_gid, stbuf->n_muid);

			} break;

		case 'V':{

				int32_t count = va_arg(ap, int32_t);

				uint32_t count = va_arg(ap, uint32_t);

				struct iov_iter *from =

						va_arg(ap, struct iov_iter *);

				errcode = p9pdu_writef(pdu, proto_version, "d",
@@ -471,7 +471,7 @@ p9pdu_vwritef(struct p9_fcall *pdu, int proto_version, const char *fmt, 
			}

			break;

		case 'R':{

				int16_t nwqid = va_arg(ap, int);

				uint16_t nwqid = va_arg(ap, int);

				struct p9_qid *wqids =

				    va_arg(ap, struct p9_qid *);

net/9p/trans_fd.c

+1 −2
Original line number Diff line number Diff line
@@ -734,6 +734,7 @@ static int parse_opts(char *params, struct p9_fd_opts *opts) 
	opts->port = P9_PORT;

	opts->rfd = ~0;

	opts->wfd = ~0;

	opts->privport = 0;



	if (!params)

		return 0;
@@ -1013,7 +1014,6 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args) 
{

	int err;

	struct p9_fd_opts opts;

	struct p9_trans_fd *p;



	parse_opts(args, &opts);
@@ -1026,7 +1026,6 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args) 
	if (err < 0)

		return err;



	p = (struct p9_trans_fd *) client->trans;

	p9_conn_create(client);



	return 0;