diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-06 20:49:28 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-06 20:49:28 +0400 |
| commit | 374916ed16180b8de388699704e827e7740be525 (patch) | |
| tree | 5ef81883ac392c0ee57dd53cfdbc64e863844957 /lib/raid6/recov.c | |
| parent | 9e68447f5b38d6092a6feeeb713a6564e963e68b (diff) | |
| parent | aba336bd1d46d6b0404b06f6915ed76150739057 (diff) | |
| download | linux-374916ed16180b8de388699704e827e7740be525.tar.xz | |
Merge tag 'md-3.5-fixes' of git://neil.brown.name/md
Pull two md fixes from NeilBrown:
"One sparse-warning fix, one bugfix for 3.4-stable"
* tag 'md-3.5-fixes' of git://neil.brown.name/md:
md: raid1/raid10: fix problem with merge_bvec_fn
lib/raid6: fix sparse warnings in recovery functions
Diffstat (limited to 'lib/raid6/recov.c')
| -rw-r--r-- | lib/raid6/recov.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/raid6/recov.c b/lib/raid6/recov.c index 1805a5cc5daa..a95bccb8497d 100644 --- a/lib/raid6/recov.c +++ b/lib/raid6/recov.c @@ -22,8 +22,8 @@ #include <linux/raid/pq.h> /* Recover two failed data blocks. */ -void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb, - void **ptrs) +static void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, + int failb, void **ptrs) { u8 *p, *q, *dp, *dq; u8 px, qx, db; @@ -66,7 +66,8 @@ void raid6_2data_recov_intx1(int disks, size_t bytes, int faila, int failb, } /* Recover failure of one data block plus the P block */ -void raid6_datap_recov_intx1(int disks, size_t bytes, int faila, void **ptrs) +static void raid6_datap_recov_intx1(int disks, size_t bytes, int faila, + void **ptrs) { u8 *p, *q, *dq; const u8 *qmul; /* Q multiplier table */ |