diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-03 18:05:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-03 18:05:35 -0700 |
| commit | 6c8addcb7669427d67029c485c8c6ab18470f83f (patch) | |
| tree | ac0f42b8013200182249b56ac3e1af508221b67c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | md/raid10: fix careless build error (diff) | |
| download | linux-dev-6c8addcb7669427d67029c485c8c6ab18470f83f.tar.xz linux-dev-6c8addcb7669427d67029c485c8c6ab18470f83f.zip | |
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
| -rw-r--r-- | drivers/md/raid10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index acf5a828c7e1..8da6282254c3 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1394,7 +1394,7 @@ retry_write: 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) |