From: Heinz Mauelshagen <heinzm@xxxxxxxxxx> Signed-off-by: heinzm <heinzm@xxxxxxxxxx> --- drivers/md/md.c | 4 ++-- include/linux/raid/pq.h | 8 ++++---- include/linux/raid/xor.h | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index e63543c98ba6..dbdd0288ddd2 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2878,8 +2878,8 @@ static int cmd_match(const char *cmd, const char *str) struct rdev_sysfs_entry { struct attribute attr; - ssize_t (*show)(struct md_rdev *, char *); - ssize_t (*store)(struct md_rdev *, const char *, size_t); + ssize_t (*show)(struct md_rdev *rdev, char *buf); + ssize_t (*store)(struct md_rdev *rdev, const char *buf, size_t sz); }; static ssize_t diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index 7fa2bef58ff3..41c525e4c959 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h @@ -70,8 +70,8 @@ extern const char raid6_empty_zero_page[PAGE_SIZE]; /* Routine choices */ struct raid6_calls { - void (*gen_syndrome)(int, size_t, void **); - void (*xor_syndrome)(int, int, int, size_t, void **); + void (*gen_syndrome)(int disks, size_t bytes, void **ptrs); + void (*xor_syndrome)(int disks, int start, int stop, size_t bytes, void **ptrs); int (*valid)(void); /* Returns 1 if this routine set is usable */ const char *name; /* Name of this routine set */ int priority; /* Relative priority ranking if non-zero */ @@ -111,8 +111,8 @@ extern const struct raid6_calls raid6_vpermxor4; extern const struct raid6_calls raid6_vpermxor8; struct raid6_recov_calls { - void (*data2)(int, size_t, int, int, void **); - void (*datap)(int, size_t, int, void **); + void (*data2)(int disks, size_t bytes, int faila, int failb, void **ptrs); + void (*datap)(int disks, size_t bytes, int faila, void **ptrs); int (*valid)(void); const char *name; int priority; diff --git a/include/linux/raid/xor.h b/include/linux/raid/xor.h index 231f467935a9..1630b0681099 100644 --- a/include/linux/raid/xor.h +++ b/include/linux/raid/xor.h @@ -11,20 +11,20 @@ struct xor_block_template { struct xor_block_template *next; const char *name; int speed; - void (*do_2)(unsigned long, unsigned long *__restrict, - const unsigned long *__restrict); - void (*do_3)(unsigned long, unsigned long *__restrict, - const unsigned long *__restrict, - const unsigned long *__restrict); - void (*do_4)(unsigned long, unsigned long *__restrict, - const unsigned long *__restrict, - const unsigned long *__restrict, - const unsigned long *__restrict); - void (*do_5)(unsigned long, unsigned long *__restrict, - const unsigned long *__restrict, - const unsigned long *__restrict, - const unsigned long *__restrict, - const unsigned long *__restrict); + void (*do_2)(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2); + void (*do_3)(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3); + void (*do_4)(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4); + void (*do_5)(unsigned long bytes, unsigned long *__restrict p1, + const unsigned long *__restrict p2, + const unsigned long *__restrict p3, + const unsigned long *__restrict p4, + const unsigned long *__restrict p5); }; #endif -- 2.39.2