From: Greg Kroah-Hartman Date: Fri, 3 Oct 2014 18:50:46 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.16.4~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb5577e91e0002ffa16a56da2ee595358ffe3a27;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: genhd-fix-leftover-might_sleep-in-blk_free_devt.patch --- diff --git a/queue-3.10/genhd-fix-leftover-might_sleep-in-blk_free_devt.patch b/queue-3.10/genhd-fix-leftover-might_sleep-in-blk_free_devt.patch new file mode 100644 index 00000000000..b85cc61b36f --- /dev/null +++ b/queue-3.10/genhd-fix-leftover-might_sleep-in-blk_free_devt.patch @@ -0,0 +1,33 @@ +From 46f341ffcfb5d8530f7d1e60f3be06cce6661b62 Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Tue, 16 Sep 2014 13:38:51 -0600 +Subject: genhd: fix leftover might_sleep() in blk_free_devt() + +From: Jens Axboe + +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 +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + block/genhd.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -445,8 +445,6 @@ int blk_alloc_devt(struct hd_struct *par + */ + void blk_free_devt(dev_t devt) + { +- might_sleep(); +- + if (devt == MKDEV(0, 0)) + return; + diff --git a/queue-3.10/series b/queue-3.10/series index c0d7fc16181..e7104ac0bae 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -105,3 +105,4 @@ percpu-fix-pcpu_alloc_pages-failure-path.patch percpu-perform-tlb-flush-after-pcpu_map_pages-failure.patch rtlwifi-rtl8192cu-add-new-id.patch lockd-fix-rpcbind-crash-on-lockd-startup-failure.patch +genhd-fix-leftover-might_sleep-in-blk_free_devt.patch