summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2016-01-13 10:01:02 +1100
committerNeilBrown <neilb@suse.com>2016-01-13 10:01:02 +1100
commitef639064b63e704e4fae0d2b89a35730cc83d613 (patch)
tree6f4dd8a0d52f798fc9eb069cea7fe6fdcf91c360
parentb3774a48dbdb37c6efb7630ddd2081cae0a56459 (diff)
downloadmdadm-ef639064b63e704e4fae0d2b89a35730cc83d613.tar.gz
restripe: fix compilation of "make test"
Signed-off-by: NeilBrown <neilb@suse.com>
-rw-r--r--Makefile2
-rw-r--r--restripe.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index fde2e63..ce2abfa 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ mdmon : $(MON_OBJS) | check_rundir
msg.o: msg.c msg.h
test_stripe : restripe.c xmalloc.o mdadm.h
- $(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe xmalloc.o -DMAIN restripe.c
+ $(CC) $(CFLAGS) $(CXFLAGS) $(LDFLAGS) -o test_stripe xmalloc.o -DMAIN restripe.c
raid6check : raid6check.o mdadm.h $(CHECK_OBJS)
$(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
diff --git a/restripe.c b/restripe.c
index 4d92190..56dca73 100644
--- a/restripe.c
+++ b/restripe.c
@@ -434,7 +434,7 @@ void raid6_datap_recov(int disks, size_t bytes, int faila, uint8_t **ptrs,
/* Try to find out if a specific disk has a problem */
int raid6_check_disks(int data_disks, int start, int chunk_size,
int level, int layout, int diskP, int diskQ,
- char *p, char *q, char **stripes)
+ uint8_t *p, uint8_t *q, char **stripes)
{
int i;
int data_id, diskD;
@@ -827,8 +827,8 @@ int test_stripes(int *source, unsigned long long *offsets,
char *stripe_buf = xmalloc(raid_disks * chunk_size);
char **stripes = xmalloc(raid_disks * sizeof(char*));
char **blocks = xmalloc(raid_disks * sizeof(char*));
- char *p = xmalloc(chunk_size);
- char *q = xmalloc(chunk_size);
+ uint8_t *p = xmalloc(chunk_size);
+ uint8_t *q = xmalloc(chunk_size);
int i;
int diskP, diskQ;