summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-09 14:21:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-09 14:21:20 -0700
commit64569520920a3ca5d456ddd9f4f95fc6ea9b8b45 (patch)
tree4d29bf98b57ebb9d4866293384f86b0d0d76f635 /drivers/block
parentdbfa18c5d7695766f24c0c140204e1f8c921fb95 (diff)
parentccc45cb4e7271c74dbb27776ae8f73d84557f5c6 (diff)
Merge tag 'block-6.4-2023-06-09' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe: - Fix an issue with the hardware queue nr_active, causing it to become imbalanced (Tian) - Fix an issue with null_blk not releasing pages if configured as memory backed (Nitesh) - Fix a locking issue in dasd (Jan) * tag 'block-6.4-2023-06-09' of git://git.kernel.dk/linux: s390/dasd: Use correct lock while counting channel queue length null_blk: Fix: memory release when memory_backed=1 blk-mq: fix blk_mq_hw_ctx active request accounting
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/null_blk/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c
index b3fedafe301e..864013019d6b 100644
--- a/drivers/block/null_blk/main.c
+++ b/drivers/block/null_blk/main.c
@@ -2244,6 +2244,7 @@ static void null_destroy_dev(struct nullb *nullb)
struct nullb_device *dev = nullb->dev;
null_del_dev(nullb);
+ null_free_device_storage(dev, false);
null_free_dev(dev);
}