Skip to content

Commit

Permalink
Merge tag 'md-3.5-fixes' of git://neil.brown.name/md
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Jul 4, 2012
2 parents 5672874 + 1068411 commit 6c8addc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/md/raid10.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6c8addc

Please sign in to comment.