summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-09-16 13:38:51 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 14:52:20 -0700
commit9783e9905e58eab4ddbdccbf66d83e9aecbf50d1 (patch)
tree40b7be97f8c54ff52c6949316dd90fad4367f04e /block
parent0c99fc04f3d4f8a0731c2cc1b2b4d363542b9bbe (diff)
downloadlwn-9783e9905e58eab4ddbdccbf66d83e9aecbf50d1.tar.gz
lwn-9783e9905e58eab4ddbdccbf66d83e9aecbf50d1.zip
genhd: fix leftover might_sleep() in blk_free_devt()
commit 46f341ffcfb5d8530f7d1e60f3be06cce6661b62 upstream. Commit 2da78092 changed the locking from a mutex to a spinlock, so we now longer sleep in this context. But there was a leftover might_sleep() in there, which now triggers since we do the final free from an RCU callback. Get rid of it. Reported-by: Pontus Fuchs <pontus.fuchs@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 09da5e4a8e03..e6723bd4d7a1 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -445,8 +445,6 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt)
*/
void blk_free_devt(dev_t devt)
{
- might_sleep();
-
if (devt == MKDEV(0, 0))
return;