From: Jonathan Brassow <jbrassow@redhat.com>
To: linux-raid@vger.kernel.org
Cc: neilb@suse.de, jbrassow@redhat.com
Subject: [PATCH] MD: Do not increment resync_mismatches unless MD_RECOVERY_REQUESTED
Date: Fri, 19 Apr 2013 15:09:21 -0500 [thread overview]
Message-ID: <1366402161.18514.1.camel@f16> (raw)
MD: Do not increment resync_mismatches unless MD_RECOVERY_REQUESTED
resync_mismatches is used to display the number of differences that
have been found or repaired during a scrubbing operation. It is not
meant to count anything during resync or repair operations. (How
much sense does it make to find resync_mismatches populated after an
initial synchronization of the array? After cleaning-up an unclean
shutdown? After [re]integrating a device into an existing array?)
The incrementing of the variable must be restricted to when the user
initiates a scrubbing operation (i.e. "check" or "repair").
Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>
Index: linux-upstream/drivers/md/raid1.c
===================================================================
--- linux-upstream.orig/drivers/md/raid1.c
+++ linux-upstream/drivers/md/raid1.c
@@ -1878,7 +1878,8 @@ static int process_checks(struct r1bio *
}
} else
j = 0;
- if (j >= 0)
+ if ((j >= 0) &&
+ (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)))
atomic64_add(r1_bio->sectors, &mddev->resync_mismatches);
if (j < 0 || (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)
&& test_bit(BIO_UPTODATE, &sbio->bi_flags))) {
Index: linux-upstream/drivers/md/raid10.c
===================================================================
--- linux-upstream.orig/drivers/md/raid10.c
+++ linux-upstream/drivers/md/raid10.c
@@ -2071,7 +2071,10 @@ static void sync_request_write(struct md
break;
if (j == vcnt)
continue;
- atomic64_add(r10_bio->sectors, &mddev->resync_mismatches);
+
+ if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
+ atomic64_add(r10_bio->sectors,
+ &mddev->resync_mismatches);
if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery))
/* Don't fix anything. */
continue;
Index: linux-upstream/drivers/md/raid5.c
===================================================================
--- linux-upstream.orig/drivers/md/raid5.c
+++ linux-upstream/drivers/md/raid5.c
@@ -2989,7 +2989,10 @@ static void handle_parity_checks5(struct
*/
set_bit(STRIPE_INSYNC, &sh->state);
else {
- atomic64_add(STRIPE_SECTORS, &conf->mddev->resync_mismatches);
+ if (test_bit(MD_RECOVERY_REQUESTED,
+ &conf->mddev->recovery))
+ atomic64_add(STRIPE_SECTORS,
+ &conf->mddev->resync_mismatches);
if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery))
/* don't try to repair!! */
set_bit(STRIPE_INSYNC, &sh->state);
@@ -3141,7 +3144,10 @@ static void handle_parity_checks6(struct
*/
}
} else {
- atomic64_add(STRIPE_SECTORS, &conf->mddev->resync_mismatches);
+ if (test_bit(MD_RECOVERY_REQUESTED,
+ &conf->mddev->recovery))
+ atomic64_add(STRIPE_SECTORS,
+ &conf->mddev->resync_mismatches);
if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery))
/* don't try to repair!! */
set_bit(STRIPE_INSYNC, &sh->state);
next reply other threads:[~2013-04-19 20:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 20:09 Jonathan Brassow [this message]
2013-04-22 0:36 ` [PATCH] MD: Do not increment resync_mismatches unless MD_RECOVERY_REQUESTED NeilBrown
2013-04-22 16:26 ` Brassow Jonathan
2013-04-22 17:22 ` Doug Ledford
2013-04-22 23:44 ` NeilBrown
2013-04-22 23:59 ` NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366402161.18514.1.camel@f16 \
--to=jbrassow@redhat.com \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.