linux-next: manual merge of the vfs tree with Linus' tree

Path	csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the vfs tree with Linus' tree
Date	Mon, 23 Jan 2017 00:40:01 +0100
Message-ID	<t2zTP-7gP-1@gated-at.bofh.it> (permalink)
X-Original-To	Al Viro <viro@ZenIV.linux.org.uk>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1485128175; bh=2t65ZD1XdjICOD+iCAhsKcN0qF3A3Oe0l3h/7GvY7Qk=; h=Date:From:To:Cc:Subject:From; b=gRh3pW+DU9FIw1iCaoIHkavXqUBDn3gfb9fdtyYlX3Ng4B2guufwovdNmpAeJvx0C YkPRITJkKJaGNm3u4KljyRQNmjKveieQlJkUnv/tWwCFiNprKGjK7VcyFcvd3S3SCV ulgjZdy8vjWjeo1wF3vkmDYwZbT27kJ1zLg6+7d0=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	61
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Josef Bacik <jbacik@fb.com>, Jens Axboe <axboe@fb.com>
X-Original-Date	Mon, 23 Jan 2017 10:36:14 +1100
X-Original-Message-ID	<20170123103614.790e6a6b@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1564593

Show key headers only | View raw

Hi Al,

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

  drivers/block/nbd.c

between commit:

  d61b7f972dab ("nbd: only set MSG_MORE when we have more to send")

from Linus' tree and commit:

  c9f2b6aeb922 ("[nbd] pass iov_iter to nbd_xmit()")

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 drivers/block/nbd.c
index 9fd06eeb1a17,3c2dbe412c02..000000000000
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@@ -271,8 -256,10 +256,10 @@@ static int sock_xmit(struct nbd_device 
  static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index)
  {
  	struct request *req = blk_mq_rq_from_pdu(cmd);
 -	int result, flags;
 +	int result;
- 	struct nbd_request request;
+ 	struct nbd_request request = {.magic = htonl(NBD_REQUEST_MAGIC)};
+ 	struct kvec iov = {.iov_base = &request, .iov_len = sizeof(request)};
+ 	struct iov_iter from;
  	unsigned long size = blk_rq_bytes(req);
  	struct bio *bio;
  	u32 type;
@@@ -318,11 -306,14 +305,13 @@@
  
  		bio_for_each_segment(bvec, bio, iter) {
  			bool is_last = !next && bio_iter_last(bvec, iter);
 +			int flags = is_last ? 0 : MSG_MORE;
  
 -			if (is_last)
 -				flags = MSG_MORE;
  			dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n",
  				cmd, bvec.bv_len);
- 			result = sock_send_bvec(nbd, index, &bvec, flags);
+ 			iov_iter_bvec(&from, ITER_BVEC | WRITE,
+ 				      &bvec, 1, bvec.bv_len);
+ 			result = sock_xmit(nbd, index, 1, &from, flags);
  			if (result <= 0) {
  				dev_err(disk_to_dev(nbd->disk),
  					"Send data failed (result %d)\n",

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the vfs tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-23 00:40 +0100

csiph-web