linux-next: manual merge of the vfs tree with the v9fs tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  net/9p/client.c

between commit:

  c249fb4f9193 ("9p: roll p9_tag_remove into p9_req_put")

from the v9fs tree and commit:

  f0be81780879 ("9p: convert to advancing variant of iov_iter_get_pages_alloc()")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/9p/client.c
index 9aaef9c90666,cb4324211561..000000000000
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@@ -1604,32 -1526,34 +1522,34 @@@ p9_client_read_once(struct p9_fid *fid
  	}
  
  	*err = p9pdu_readf(&req->rc, clnt->proto_version,
- 			   "D", &count, &dataptr);
+ 			   "D", &received, &dataptr);
  	if (*err) {
+ 		if (!non_zc)
+ 			iov_iter_revert(to, count - iov_iter_count(to));
  		trace_9p_protocol_dump(clnt, &req->rc);
 -		p9_tag_remove(clnt, req);
 +		p9_req_put(clnt, req);
  		return 0;
  	}
- 	if (rsize < count) {
- 		pr_err("bogus RREAD count (%d > %d)\n", count, rsize);
- 		count = rsize;
+ 	if (rsize < received) {
+ 		pr_err("bogus RREAD count (%d > %d)\n", received, rsize);
+ 		received = rsize;
  	}
  
  	p9_debug(P9_DEBUG_9P, "<<< RREAD count %d\n", count);
  
  	if (non_zc) {
- 		int n = copy_to_iter(dataptr, count, to);
+ 		int n = copy_to_iter(dataptr, received, to);
  
- 		if (n != count) {
+ 		if (n != received) {
  			*err = -EFAULT;
 -			p9_tag_remove(clnt, req);
 +			p9_req_put(clnt, req);
  			return n;
  		}
  	} else {
- 		iov_iter_advance(to, count);
+ 		iov_iter_revert(to, count - received - iov_iter_count(to));
  	}
 -	p9_tag_remove(clnt, req);
 +	p9_req_put(clnt, req);
- 	return count;
+ 	return received;
  }
  EXPORT_SYMBOL(p9_client_read_once);
  
@@@ -1668,23 -1594,24 +1590,24 @@@ p9_client_write(struct p9_fid *fid, u6
  			break;
  		}
  
- 		*err = p9pdu_readf(&req->rc, clnt->proto_version, "d", &count);
+ 		*err = p9pdu_readf(&req->rc, clnt->proto_version, "d", &written);
  		if (*err) {
+ 			iov_iter_revert(from, count - iov_iter_count(from));
  			trace_9p_protocol_dump(clnt, &req->rc);
 -			p9_tag_remove(clnt, req);
 +			p9_req_put(clnt, req);
  			break;
  		}
- 		if (rsize < count) {
- 			pr_err("bogus RWRITE count (%d > %d)\n", count, rsize);
- 			count = rsize;
+ 		if (rsize < written) {
+ 			pr_err("bogus RWRITE count (%d > %d)\n", written, rsize);
+ 			written = rsize;
  		}
  
  		p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", count);
  
 -		p9_tag_remove(clnt, req);
 +		p9_req_put(clnt, req);
- 		iov_iter_advance(from, count);
- 		total += count;
- 		offset += count;
+ 		iov_iter_revert(from, count - written - iov_iter_count(from));
+ 		total += written;
+ 		offset += written;
  	}
  	return total;
  }

Attachment: pgpLLs2lRFpZV.pgp
Description: OpenPGP digital signature