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

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
...@@ -1394,7 +1394,7 @@ static void make_request(struct mddev *mddev, struct bio * bio) ...@@ -1394,7 +1394,7 @@ static void make_request(struct mddev *mddev, struct bio * bio)
bio_list_add(&conf->pending_bio_list, mbio); bio_list_add(&conf->pending_bio_list, mbio);
conf->pending_count++; conf->pending_count++;
spin_unlock_irqrestore(&conf->device_lock, flags); spin_unlock_irqrestore(&conf->device_lock, flags);
if (!mddev_check_plugged(mddev, 0, 0)) if (!mddev_check_plugged(mddev))
md_wakeup_thread(mddev->thread); md_wakeup_thread(mddev->thread);
if (!r10_bio->devs[i].repl_bio) if (!r10_bio->devs[i].repl_bio)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment