md: fix up plugging (again). breaks build of the latest 3.5rc5+

md: fix up plugging (again). breaks build of the latest 3.5rc5+

[Tobias Klausmann]

Proposing this patch:

>From c6ac2740ed916ccf5b6fec0682101dd7a6a50f9f Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.klausmann@mni.thm.de>
Date: Tue, 3 Jul 2012 23:03:43 +0200
Subject: [PATCH] Fix patch md: fix up plugging again. Commit
 b357f04a67c2aeee828b240863cd3f21d6cb3179

---
 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 acf5a82..8da6282 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)
-- 
1.7.7

at least it compiles with this applied!

Thank you,
Tobias Klausmann

Re: md: fix up plugging (again). breaks build of the latest 3.5rc5+

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]

On Tue, 03 Jul 2012 23:42:10 +0200 Tobias Klausmann
<tobias.johannes.klausmann@mni.thm.de> wrote:

> Proposing this patch:
> 
> >From c6ac2740ed916ccf5b6fec0682101dd7a6a50f9f Mon Sep 17 00:00:00 2001
> From: Tobias Klausmann <tobias.klausmann@mni.thm.de>
> Date: Tue, 3 Jul 2012 23:03:43 +0200
> Subject: [PATCH] Fix patch md: fix up plugging again. Commit
>  b357f04a67c2aeee828b240863cd3f21d6cb3179
> 
> ---
>  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 acf5a82..8da6282 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)

Thanks.  That was careless.
I've posted a pull request so Linus can take either that or this.

Thanks,
NeilBrown

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]