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

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

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Just two small fixes for this -rc.

  One is just killing an unused variable from Keith, but the other
  fixes a performance regression for nbd in this series, where we
  inadvertently flipped when we set MSG_MORE when outputting data"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nbd: only set MSG_MORE when we have more to send
  blk-mq: Remove unused variable
parents cca112ec d61b7f97

block/blk-mq.c

+0 −1
Original line number Diff line number Diff line
@@ -912,7 +912,6 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list) 
static void blk_mq_process_rq_list(struct blk_mq_hw_ctx *hctx)

{

	LIST_HEAD(rq_list);

	LIST_HEAD(driver_list);



	if (unlikely(blk_mq_hctx_stopped(hctx)))

		return;

drivers/block/nbd.c

+2 −4
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static inline int sock_send_bvec(struct nbd_device *nbd, int index, 
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;

	unsigned long size = blk_rq_bytes(req);

	struct bio *bio;
@@ -310,7 +310,6 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 
	if (type != NBD_CMD_WRITE)

		return 0;



	flags = 0;

	bio = req->bio;

	while (bio) {

		struct bio *next = bio->bi_next;
@@ -319,9 +318,8 @@ static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 


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