Skip to contentSkip to conversation

md/raid1:remove unnecessary set_bit(MD_RECOVERY_INTR,&mddev->recovery).

PATCH majianpeng 2 participants 2 messages Mar 28, 2012 – Apr 2, 2012 MD RAID

lore
Share & tools
lore

majianpeng

author
#0 lore raw

From 641d71c2c1acc15536c621e2aa9806fe42b9cb8a Mon Sep 17 00:00:00 2001
From: majianpeng <[email protected]>
Date: Wed, 28 Mar 2012 20:02:05 +0800
Subject: [PATCH] md/raid1:remove unnecessary set_bit(MD_RECOVERY_INTR,&mddev->recovery).

Signed-off-by majianpeng <[email protected]>
---
 drivers/md/raid1.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/md/raid1.c +0 -2
index 4a40a20..81083f2 100644
@@ -1649,7 +1649,6 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
 			if (abort) {
 				conf->recovery_disabled =
 					mddev->recovery_disabled;
-				set_bit(MD_RECOVERY_INTR, &mddev->recovery);
 				md_done_sync(mddev, r1_bio->sectors, 0);
 				put_buf(r1_bio);
 				return 0;

@@ -2403,7 +2402,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
 			 * fail the really bad ones ???
 			 */
 			conf->recovery_disabled = mddev->recovery_disabled;
-			set_bit(MD_RECOVERY_INTR, &mddev->recovery);
 			return 0;
 		} else
 			return min_bad;
Signature · 6 lines
1.7.5.4

 				
--------------
majianpeng
2012-03-28
#1 lore raw
Quoted 16 lines · On Wed, 28 Mar 2012 20:04:46 +0800 "majianpeng" <[email protected]> wrote:
Quoted 1 line

From 641d71c2c1acc15536c621e2aa9806fe42b9cb8a Mon Sep 17 00:00:00 2001

From: majianpeng <[email protected]>
Date: Wed, 28 Mar 2012 20:02:05 +0800
Subject: [PATCH] md/raid1:remove unnecessary set_bit(MD_RECOVERY_INTR,&mddev->recovery).

Signed-off-by majianpeng <[email protected]>
---
 drivers/md/raid1.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/md/raid1.c +0 -0
index 4a40a20..81083f2 100644

drivers/md/raid1.c static int fix_sync_read_error(struct r1bio *r1_bio) · line 1654

Quoted 7 lines
drivers/md/raid1.c +0 -1
@@ -1649,7 +1649,6 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
 			if (abort) {
 				conf->recovery_disabled =
 					mddev->recovery_disabled;
-				set_bit(MD_RECOVERY_INTR, &mddev->recovery);
 				md_done_sync(mddev, r1_bio->sectors, 0);
 				put_buf(r1_bio);
 				return 0;

This one is unnecessary because md_done_sync set it for us,

drivers/md/raid1.c static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp · line 2407

Quoted 8 lines
drivers/md/raid1.c +0 -1
@@ -2403,7 +2402,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
 			 * fail the really bad ones ???
 			 */
 			conf->recovery_disabled = mddev->recovery_disabled;
-			set_bit(MD_RECOVERY_INTR, &mddev->recovery);
 			return 0;
 		} else
 			return min_bad;

But why is this one unnecessary? This is why including and explanation at the top of the patch helps.

Not applied - but I will if you explain why it is needed.

Thanks,
NeilBrown