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 tag 'block-5.16-2021-11-27' of git://git.kernel.dk/linux-block

Pull more block fixes from Jens Axboe:
"Turns out that the flushing out of pending fixes before the
Thanksgiving break didn't quite work out in terms of timing, so here's
a followup set of fixes:

- rq_qos_done() should be called regardless of whether or not we're
the final put of the request, it's not related to the freeing of
the state. This fixes an IO stall with wbt that a few users have
reported, a regression in this release.

- Only define zram_wb_devops if it's used, fixing a compilation
warning for some compilers"

* tag 'block-5.16-2021-11-27' of git://git.kernel.dk/linux-block:
zram: only make zram_wb_devops for CONFIG_ZRAM_WRITEBACK
block: call rq_qos_done() before ref check in batch completions

Linus Torvalds 650c8edf 9e9fbe44

+4 -1
+2 -1
block/blk-mq.c
··· 860 860 if (iob->need_ts) 861 861 __blk_mq_end_request_acct(rq, now); 862 862 863 + rq_qos_done(rq->q, rq); 864 + 863 865 WRITE_ONCE(rq->state, MQ_RQ_IDLE); 864 866 if (!refcount_dec_and_test(&rq->ref)) 865 867 continue; 866 868 867 869 blk_crypto_free_request(rq); 868 870 blk_pm_mark_last_busy(rq); 869 - rq_qos_done(rq->q, rq); 870 871 871 872 if (nr_tags == TAG_COMP_BATCH || cur_hctx != rq->mq_hctx) { 872 873 if (cur_hctx)
+2
drivers/block/zram/zram_drv.c
··· 1853 1853 .owner = THIS_MODULE 1854 1854 }; 1855 1855 1856 + #ifdef CONFIG_ZRAM_WRITEBACK 1856 1857 static const struct block_device_operations zram_wb_devops = { 1857 1858 .open = zram_open, 1858 1859 .submit_bio = zram_submit_bio, 1859 1860 .swap_slot_free_notify = zram_slot_free_notify, 1860 1861 .owner = THIS_MODULE 1861 1862 }; 1863 + #endif 1862 1864 1863 1865 static DEVICE_ATTR_WO(compact); 1864 1866 static DEVICE_ATTR_RW(disksize);