summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-01-14 00:41:19 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2023-01-14 00:41:19 +0100
commit97ec4d559d939743e8af83628be5af8da610d9dc (patch)
tree346e3cf65e037d89598f0334e0099c16a1128e1f /block
parentMerge tag 'io_uring-6.2-2023-01-13' of git://git.kernel.dk/linux (diff)
parentMerge tag 'nvme-6.2-2023-01-12' of git://git.infradead.org/nvme into block-6.2 (diff)
downloadlinux-97ec4d559d939743e8af83628be5af8da610d9dc.tar.xz
linux-97ec4d559d939743e8af83628be5af8da610d9dc.zip
Merge tag 'block-6.2-2023-01-13' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe: "Nothing major in here, just a collection of NVMe fixes and dropping a wrong might_sleep() that static checkers tripped over but which isn't valid" * tag 'block-6.2-2023-01-13' of git://git.kernel.dk/linux: MAINTAINERS: stop nvme matching for nvmem files nvme: don't allow unprivileged passthrough on partitions nvme: replace the "bool vec" arguments with flags in the ioctl path nvme: remove __nvme_ioctl nvme-pci: fix error handling in nvme_pci_enable() nvme-pci: add NVME_QUIRK_IDENTIFY_CNS quirk to Apple T2 controllers nvme-apple: add NVME_QUIRK_IDENTIFY_CNS quirk to fix regression block: Drop spurious might_sleep() from blk_put_queue()
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 9321767470dc..b5098355d8b2 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -283,12 +283,9 @@ static void blk_free_queue(struct request_queue *q)
*
* Decrements the refcount of the request_queue and free it when the refcount
* reaches 0.
- *
- * Context: Can sleep.
*/
void blk_put_queue(struct request_queue *q)
{
- might_sleep();
if (refcount_dec_and_test(&q->refs))
blk_free_queue(q);
}