Skip to contentSkip to conversation

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

PATCH Tobias Klausmann 2 participants 2 messages Jul 3, 2012 MD RAID

lore
Share & tools
lore
#0 lore raw

Proposing this patch:

Quoted 1 line

From c6ac2740ed916ccf5b6fec0682101dd7a6a50f9f Mon Sep 17 00:00:00 2001

From: Tobias Klausmann <[email protected]>
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(-)
drivers/md/raid10.c +1 -1
index acf5a82..8da6282 100644
@@ -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)
Signature · 6 lines
1.7.7

at least it compiles with this applied!

Thank you,
Tobias Klausmann
#1 lore raw
Quoted 17 lines · On Tue, 03 Jul 2012 23:42:10 +0200 Tobias Klausmann…

Proposing this patch:

Quoted 1 line

From c6ac2740ed916ccf5b6fec0682101dd7a6a50f9f Mon Sep 17 00:00:00 2001

From: Tobias Klausmann <[email protected]>
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(-)
drivers/md/raid10.c +0 -0
index acf5a82..8da6282 100644

drivers/md/raid10.c retry_write: · line 1400

Quoted 8 lines
drivers/md/raid10.c +1 -1
@@ -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