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

Commit 9931a07d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull AFS updates from Al Viro:
 "AFS series, with some iov_iter bits included"

* 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
  missing bits of "iov_iter: Separate type from direction and use accessor functions"
  afs: Probe multiple fileservers simultaneously
  afs: Fix callback handling
  afs: Eliminate the address pointer from the address list cursor
  afs: Allow dumping of server cursor on operation failure
  afs: Implement YFS support in the fs client
  afs: Expand data structure fields to support YFS
  afs: Get the target vnode in afs_rmdir() and get a callback on it
  afs: Calc callback expiry in op reply delivery
  afs: Fix FS.FetchStatus delivery from updating wrong vnode
  afs: Implement the YFS cache manager service
  afs: Remove callback details from afs_callback_break struct
  afs: Commit the status on a new file/dir/symlink
  afs: Increase to 64-bit volume ID and 96-bit vnode ID for YFS
  afs: Don't invoke the server to read data beyond EOF
  afs: Add a couple of tracepoints to log I/O errors
  afs: Handle EIO from delivery function
  afs: Fix TTL on VL server and address lists
  afs: Implement VL server rotation
  afs: Improve FS server rotation error handling
  ...
parents e468f5c0 0e9b4a82

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, 
	/*

	 * success

	 */

	if (((iter->type & WRITE) && (!map_data || !map_data->null_mapped)) ||

	if ((iov_iter_rw(iter) == WRITE && (!map_data || !map_data->null_mapped)) ||

	    (map_data && map_data->from_user)) {

		ret = bio_copy_from_iter(bio, iter);

		if (ret)

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ int drbd_send(struct drbd_connection *connection, struct socket *sock, 


	/* THINK  if (signal_pending) return ... ? */



	iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1, size);

	iov_iter_kvec(&msg.msg_iter, WRITE, &iov, 1, size);



	if (sock == connection->data.socket) {

		rcu_read_lock();

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int drbd_recv_short(struct socket *sock, void *buf, size_t size, int flag 
	struct msghdr msg = {

		.msg_flags = (flags ? flags : MSG_WAITALL | MSG_NOSIGNAL)

	};

	iov_iter_kvec(&msg.msg_iter, READ | ITER_KVEC, &iov, 1, size);

	iov_iter_kvec(&msg.msg_iter, READ, &iov, 1, size);

	return sock_recvmsg(sock, &msg, msg.msg_flags);

}

drivers/block/loop.c

+4 −5
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos) 
	struct iov_iter i;

	ssize_t bw;



	iov_iter_bvec(&i, ITER_BVEC | WRITE, bvec, 1, bvec->bv_len);

	iov_iter_bvec(&i, WRITE, bvec, 1, bvec->bv_len);



	file_start_write(file);

	bw = vfs_iter_write(file, &i, ppos, 0);
@@ -347,7 +347,7 @@ static int lo_read_simple(struct loop_device *lo, struct request *rq, 
	ssize_t len;



	rq_for_each_segment(bvec, rq, iter) {

		iov_iter_bvec(&i, ITER_BVEC, &bvec, 1, bvec.bv_len);

		iov_iter_bvec(&i, READ, &bvec, 1, bvec.bv_len);

		len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);

		if (len < 0)

			return len;
@@ -388,7 +388,7 @@ static int lo_read_transfer(struct loop_device *lo, struct request *rq, 
		b.bv_offset = 0;

		b.bv_len = bvec.bv_len;



		iov_iter_bvec(&i, ITER_BVEC, &b, 1, b.bv_len);

		iov_iter_bvec(&i, READ, &b, 1, b.bv_len);

		len = vfs_iter_read(lo->lo_backing_file, &i, &pos, 0);

		if (len < 0) {

			ret = len;
@@ -555,8 +555,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, 
	}

	atomic_set(&cmd->ref, 2);



	iov_iter_bvec(&iter, ITER_BVEC | rw, bvec,

		      segments, blk_rq_bytes(rq));

	iov_iter_bvec(&iter, rw, bvec, segments, blk_rq_bytes(rq));

	iter.iov_offset = offset;



	cmd->iocb.ki_pos = pos;

drivers/block/nbd.c

+5 −7
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 
	u32 nbd_cmd_flags = 0;

	int sent = nsock->sent, skip = 0;



	iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request));

	iov_iter_kvec(&from, WRITE, &iov, 1, sizeof(request));



	switch (req_op(req)) {

	case REQ_OP_DISCARD:
@@ -564,8 +564,7 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 


			dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",

				req, bvec.bv_len);

			iov_iter_bvec(&from, ITER_BVEC | WRITE,

				      &bvec, 1, bvec.bv_len);

			iov_iter_bvec(&from, WRITE, &bvec, 1, bvec.bv_len);

			if (skip) {

				if (skip >= iov_iter_count(&from)) {

					skip -= iov_iter_count(&from);
@@ -624,7 +623,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) 
	int ret = 0;



	reply.magic = 0;

	iov_iter_kvec(&to, READ | ITER_KVEC, &iov, 1, sizeof(reply));

	iov_iter_kvec(&to, READ, &iov, 1, sizeof(reply));

	result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL);

	if (result <= 0) {

		if (!nbd_disconnected(config))
@@ -678,8 +677,7 @@ static struct nbd_cmd *nbd_read_stat(struct nbd_device *nbd, int index) 
		struct bio_vec bvec;



		rq_for_each_segment(bvec, req, iter) {

			iov_iter_bvec(&to, ITER_BVEC | READ,

				      &bvec, 1, bvec.bv_len);

			iov_iter_bvec(&to, READ, &bvec, 1, bvec.bv_len);

			result = sock_xmit(nbd, index, 0, &to, MSG_WAITALL, NULL);

			if (result <= 0) {

				dev_err(disk_to_dev(nbd->disk), "Receive data failed (result %d)\n",
@@ -1073,7 +1071,7 @@ static void send_disconnects(struct nbd_device *nbd) 
	for (i = 0; i < config->num_connections; i++) {

		struct nbd_sock *nsock = config->socks[i];



		iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request));

		iov_iter_kvec(&from, WRITE, &iov, 1, sizeof(request));

		mutex_lock(&nsock->tx_lock);

		ret = sock_xmit(nbd, i, 1, &from, 0, NULL);

		if (ret <= 0)