tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds e3737b91 cca112ec

+2 -5
-1
block/blk-mq.c
··· 912 912 static void blk_mq_process_rq_list(struct blk_mq_hw_ctx *hctx) 913 913 { 914 914 LIST_HEAD(rq_list); 915 - LIST_HEAD(driver_list); 916 915 917 916 if (unlikely(blk_mq_hctx_stopped(hctx))) 918 917 return;
+2 -4
drivers/block/nbd.c
··· 271 271 static int nbd_send_cmd(struct nbd_device *nbd, struct nbd_cmd *cmd, int index) 272 272 { 273 273 struct request *req = blk_mq_rq_from_pdu(cmd); 274 - int result, flags; 274 + int result; 275 275 struct nbd_request request; 276 276 unsigned long size = blk_rq_bytes(req); 277 277 struct bio *bio; ··· 310 310 if (type != NBD_CMD_WRITE) 311 311 return 0; 312 312 313 - flags = 0; 314 313 bio = req->bio; 315 314 while (bio) { 316 315 struct bio *next = bio->bi_next; ··· 318 319 319 320 bio_for_each_segment(bvec, bio, iter) { 320 321 bool is_last = !next && bio_iter_last(bvec, iter); 322 + int flags = is_last ? 0 : MSG_MORE; 321 323 322 - if (is_last) 323 - flags = MSG_MORE; 324 324 dev_dbg(nbd_to_dev(nbd), "request %p: sending %d bytes data\n", 325 325 cmd, bvec.bv_len); 326 326 result = sock_send_bvec(nbd, index, &bvec, flags);