summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-09-16 13:38:51 -0600
committerBen Hutchings <ben@decadent.org.uk>2014-11-05 20:27:49 +0000
commit607530bf21828c96c2880282c844088baf6ae3c4 (patch)
tree4aad8ff1a964f33cd7dd790e8beffba962eef6ba
parent77179bb84cada16355fc832cc12dde32dd45a5f2 (diff)
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: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--block/genhd.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 35415810da84..41b0435415d4 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -448,8 +448,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;