From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Aug 2012 18:34:40 +0000 (-0700)
Subject: Merge tag 'md-3.6' of git://neil.brown.name/md
X-Git-Tag: v3.6-rc1~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25aa6a7ae46c6a041c46a2d314b9ab7c4f2baa41;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'md-3.6' of git://neil.brown.name/md

Pull additional md update from NeilBrown:
 "This contains a few patches that depend on plugging changes in the
  block layer so needed to wait for those.

  It also contains a Kconfig fix for the new RAID10 support in dm-raid."

* tag 'md-3.6' of git://neil.brown.name/md:
  md/dm-raid: DM_RAID should select MD_RAID10
  md/raid1: submit IO from originating thread instead of md thread.
  raid5: raid5d handle stripe in batch way
  raid5: make_request use batch stripe release
---

25aa6a7ae46c6a041c46a2d314b9ab7c4f2baa41
diff --cc drivers/md/raid5.c
index 87a2d0b,9e41ae3..adda94d
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@@ -4135,11 -4170,10 +4192,10 @@@ static void make_request(struct mddev *
  			finish_wait(&conf->wait_for_overlap, &w);
  			set_bit(STRIPE_HANDLE, &sh->state);
  			clear_bit(STRIPE_DELAYED, &sh->state);
 -			if ((bi->bi_rw & REQ_SYNC) &&
 +			if ((bi->bi_rw & REQ_NOIDLE) &&
  			    !test_and_set_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
  				atomic_inc(&conf->preread_active_stripes);
- 			mddev_check_plugged(mddev);
- 			release_stripe(sh);
+ 			release_stripe_plug(mddev, sh);
  		} else {
  			/* cannot get stripe for read-ahead, just give-up */
  			clear_bit(BIO_UPTODATE, &bi->bi_flags);