[PULL REQUEST] one bugfix for md in 3.7-rc

[NeilBrown]

Hi Linus,
 another md bugfix ... and it isn't even Friday!

Thanks,
NeilBrown


The following changes since commit 884162df2aadd7414bef4935e1a54976fd4e3988:

  md/raid10: decrement correct pending counter when writing to replacement. (2012-11-22 15:12:42 +1100)

are available in the git repository at:

  git://neil.brown.name/md/ tags/md-3.7-fixes

for you to fetch changes up to 874807a83139abc094f939e93623c5623573d543:

  md/raid1{,0}: fix deadlock in bitmap_unplug. (2012-11-27 12:14:40 +1100)

----------------------------------------------------------------
Single bugfix for raid1/raid10.

Fixes a recently introduced deadlock.

----------------------------------------------------------------
NeilBrown (1):
      md/raid1{,0}: fix deadlock in bitmap_unplug.

 drivers/md/raid1.c  | 2 +-
 drivers/md/raid10.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 636bae0..a0f7309 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -963,7 +963,7 @@ static void raid1_unplug(struct blk_plug_cb *cb, bool from_schedule)
 	struct r1conf *conf = mddev->private;
 	struct bio *bio;
 
-	if (from_schedule) {
+	if (from_schedule || current->bio_list) {
 		spin_lock_irq(&conf->device_lock);
 		bio_list_merge(&conf->pending_bio_list, &plug->pending);
 		conf->pending_count += plug->pending_cnt;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 0d5d0ff..c9acbd7 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1069,7 +1069,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)
 	struct r10conf *conf = mddev->private;
 	struct bio *bio;
 
-	if (from_schedule) {
+	if (from_schedule || current->bio_list) {
 		spin_lock_irq(&conf->device_lock);
 		bio_list_merge(&conf->pending_bio_list, &plug->pending);
 		conf->pending_count += plug->pending_cnt;

Attachment: signature.asc
Description: PGP signature