From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 02:52:40 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: next-20111012~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bf0f828e460360635351e8c21b0a86af14f28ae0;p=karo-tx-linux.git

Merge remote-tracking branch 'block/for-next'
---

bf0f828e460360635351e8c21b0a86af14f28ae0
diff --cc drivers/md/raid1.c
index d9587dffe533,97f2a5f977b1..d4ddfa627301
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@@ -1116,15 -1117,8 +1116,13 @@@ read_again
  		goto retry_write;
  	}
  
 +	r1_bio_write_done(r1_bio);
 +
 +	/* In case raid1d snuck in to freeze_array */
 +	wake_up(&conf->wait_barrier);
 +
  	if (do_sync || !bitmap || !plugged)
  		md_wakeup_thread(mddev->thread);
- 
- 	return 0;
  }
  
  static void status(struct seq_file *seq, mddev_t *mddev)