Commit 6c8addcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull raid10 build failure fix from NeilBrown:
 "I really shouldn't do important things late in the day.  It seems that
  I get careless."

* tag 'md-3.5-fixes' of git://neil.brown.name/md:
  md/raid10: fix careless build error
parents 56728748 10684112

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ static void make_request(struct mddev *mddev, struct bio * bio) 
		bio_list_add(&conf->pending_bio_list, mbio);

		conf->pending_count++;

		spin_unlock_irqrestore(&conf->device_lock, flags);

		if (!mddev_check_plugged(mddev, 0, 0))

		if (!mddev_check_plugged(mddev))

			md_wakeup_thread(mddev->thread);



		if (!r10_bio->devs[i].repl_bio)