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 (file)
index 0000000..b85cc61
--- /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 <axboe@fb.com>
+Date: Tue, 16 Sep 2014 13:38:51 -0600
+Subject: genhd: fix leftover might_sleep() in blk_free_devt()
+
+From: Jens Axboe <axboe@fb.com>
+
+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>
+
+---
+ 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 c0d7fc16181b6b4ab6dc2cbee93fc2acb9152838..e7104ac0bae77c4b1f9a8b8eda1ab0b432231dd3 100644 (file)
--- 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