From: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
To: neilb@suse.de, piergiorgio.sartor@nexgo.de
Cc: linux-raid@vger.kernel.org, Bernd Schubert <bernd.schubert@fastmail.fm>
Subject: [PATCH 4/6] raid6check: Use enums for repair type
Date: Tue, 18 Jun 2013 11:09:31 +0200 [thread overview]
Message-ID: <20130618090931.1161109.97315.stgit@fsdevel7.hpc.devnet.itwm.fhg.de> (raw)
In-Reply-To: <20130618090910.1161109.69430.stgit@fsdevel7.hpc.devnet.itwm.fhg.de>
Using hard coded numbers is error prone and hard to read by humans.
Signed-off-by: Bernd Schubert <bernd.schubert@fastmail.fm>
---
raid6check.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/raid6check.c b/raid6check.c
index 17f7430..480422d 100644
--- a/raid6check.c
+++ b/raid6check.c
@@ -27,6 +27,12 @@
#include <signal.h>
#include <sys/mman.h>
+enum repair {
+ NO_REPAIR = 0,
+ MANUAL_REPAIR,
+ AUTO_REPAIR
+};
+
int geo_map(int block, unsigned long long stripe, int raid_disks,
int level, int layout);
void qsyndrome(uint8_t *p, uint8_t *q, uint8_t **sources, int disks, int size);
@@ -142,7 +148,7 @@ int unlock_all_stripes(struct mdinfo *info, sighandler_t *sig) {
int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
int raid_disks, int chunk_size, int level, int layout,
unsigned long long start, unsigned long long length, char *name[],
- int repair, int failed_disk1, int failed_disk2)
+ enum repair repair, int failed_disk1, int failed_disk2)
{
/* read the data and p and q blocks, and check we got them right */
char *stripe_buf = xmalloc(raid_disks * chunk_size);
@@ -220,7 +226,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
if(disk == -65535) {
printf("Error detected at %llu: disk slot unknown\n", start);
}
- if(repair == 1) {
+ if(repair == MANUAL_REPAIR) {
printf("Repairing stripe %llu\n", start);
printf("Assuming slots %d (%s) and %d (%s) are incorrect\n",
failed_disk1, name[failed_disk1],
@@ -284,7 +290,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
err = unlock_all_stripes(info, sig);
if(err != 0)
goto exitCheck;
- } else if (disk >= 0 && repair == 2) {
+ } else if (disk >= 0 && repair == AUTO_REPAIR) {
printf("Auto-repairing slot %d (%s)\n", disk, name[disk]);
if (disk == diskQ) {
qsyndrome(p, (uint8_t*)stripes[diskQ], (uint8_t**)blocks, data_disks, chunk_size);
@@ -357,7 +363,7 @@ int main(int argc, char *argv[])
int chunk_size = 0;
int layout = -1;
int level = 6;
- int repair = 0;
+ enum repair repair = NO_REPAIR;
int failed_disk1, failed_disk2;
unsigned long long start, length;
int i;
@@ -447,7 +453,7 @@ int main(int argc, char *argv[])
exit_err = 1;
goto exitHere;
}
- repair = 1;
+ repair = MANUAL_REPAIR;
start = getnum(argv[3], &err);
length = 1;
failed_disk1 = getnum(argv[4], &err);
@@ -473,7 +479,7 @@ int main(int argc, char *argv[])
start = getnum(argv[2], &err);
length = getnum(argv[3], &err);
if (argc >= 5 && strcmp(argv[4], "autorepair")==0)
- repair = 2;
+ repair = AUTO_REPAIR;
}
if (err) {
next prev parent reply other threads:[~2013-06-18 9:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 9:09 [PATCH 0/6] raid6check fixes Bernd Schubert
2013-06-18 9:09 ` [PATCH 1/6] raid6check: Fix build of raid6check Bernd Schubert
2013-06-18 9:09 ` [PATCH 2/6] Makefile: Allow the user to pass EXTRA_CFLAGS Bernd Schubert
2013-06-19 0:07 ` NeilBrown
2013-06-19 9:48 ` Bernd Schubert
2013-06-24 7:01 ` NeilBrown
2013-06-18 9:09 ` [PATCH 3/6] raid6check: Fix memory leaks detected by valgrind Bernd Schubert
2013-06-18 9:09 ` Bernd Schubert [this message]
2013-06-18 9:09 ` [PATCH 5/6] raid6check: Fix compiler warnings Bernd Schubert
2013-06-18 9:09 ` [PATCH 6/6] raid6check: Check return value of lseek64() Bernd Schubert
2013-06-18 17:16 ` [PATCH 0/6] raid6check fixes Piergiorgio Sartor
2013-06-19 0:08 ` NeilBrown
2013-06-20 16:16 ` Piergiorgio Sartor
2013-06-24 7:04 ` NeilBrown
2013-06-24 17:10 ` Piergiorgio Sartor
2013-06-24 23:54 ` NeilBrown
2013-06-25 16:46 ` Piergiorgio Sartor
2013-06-27 4:27 ` NeilBrown
2013-06-27 20:49 ` Piergiorgio Sartor
2013-06-27 21:12 ` NeilBrown
2013-06-28 17:46 ` Piergiorgio Sartor
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=20130618090931.1161109.97315.stgit@fsdevel7.hpc.devnet.itwm.fhg.de \
--to=bernd.schubert@itwm.fraunhofer.de \
--cc=bernd.schubert@fastmail.fm \
--cc=linux-raid@vger.kernel.org \
--cc=neilb@suse.de \
--cc=piergiorgio.sartor@nexgo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).