diff options
author | Jens Axboe <axboe@fb.com> | 2014-09-16 13:38:51 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:54:13 -0700 |
commit | 459bd57b368c583f53faf84cf8e483837584f9ae (patch) | |
tree | 844c21dabe7f7a17feb379e430307149ce34d596 /block | |
parent | d4e4b73470ee5e9a93d543cc0eaa4e4d28f1c2df (diff) | |
download | linux-3.10-459bd57b368c583f53faf84cf8e483837584f9ae.tar.gz linux-3.10-459bd57b368c583f53faf84cf8e483837584f9ae.tar.bz2 linux-3.10-459bd57b368c583f53faf84cf8e483837584f9ae.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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c index 6190449e54e..e670148c377 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; |