mdadm: improve the dlm locking mechanism for clustered raid

[thirdparty/mdadm.git] / restripe.c

diff --git a/restripe.c b/restripe.c
index 1c859a3058a417467f18aa2597e5d0d6b984df95..31b07e89f318191ec97c39bda899dedbd7d2fbf6 100644 (file)
--- a/restripe.c
+++ b/restripe.c
@@ -58,26 +58,30 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                return block;
        case 500 + ALGORITHM_LEFT_ASYMMETRIC:
                pd = (raid_disks-1) - stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                if (block >= pd)
                        block++;
                return block;
 
        case 500 + ALGORITHM_RIGHT_ASYMMETRIC:
                pd = stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                if (block >= pd)
                        block++;
                return block;
 
        case 500 + ALGORITHM_LEFT_SYMMETRIC:
                pd = (raid_disks - 1) - stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                return (pd + 1 + block) % raid_disks;
 
        case 500 + ALGORITHM_RIGHT_SYMMETRIC:
                pd = stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                return (pd + 1 + block) % raid_disks;
 
        case 500 + ALGORITHM_PARITY_0:
@@ -94,7 +98,8 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                        return raid_disks - 1;
                raid_disks--;
                pd = (raid_disks-1) - stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                if (block >= pd)
                        block++;
                return block;
@@ -104,7 +109,8 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                        return raid_disks - 1;
                raid_disks--;
                pd = stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                if (block >= pd)
                        block++;
                return block;
@@ -114,7 +120,8 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                        return raid_disks - 1;
                raid_disks--;
                pd = (raid_disks - 1) - stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                return (pd + 1 + block) % raid_disks;
 
        case 600 + ALGORITHM_RIGHT_SYMMETRIC_6:
@@ -122,7 +129,8 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                        return raid_disks - 1;
                raid_disks--;
                pd = stripe % raid_disks;
-               if (block == -1) return pd;
+               if (block == -1)
+                       return pd;
                return (pd + 1 + block) % raid_disks;
 
        case 600 + ALGORITHM_PARITY_0_6:
@@ -139,8 +147,10 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
 
        case 600 + ALGORITHM_LEFT_ASYMMETRIC:
                pd = raid_disks - 1 - (stripe % raid_disks);
-               if (block == -1) return pd;
-               if (block == -2) return (pd+1) % raid_disks;
+               if (block == -1)
+                       return pd;
+               if (block == -2)
+                       return (pd+1) % raid_disks;
                if (pd == raid_disks - 1)
                        return block+1;
                if (block >= pd)
@@ -151,8 +161,10 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                /* Different order for calculating Q, otherwize same as ... */
        case 600 + ALGORITHM_RIGHT_ASYMMETRIC:
                pd = stripe % raid_disks;
-               if (block == -1) return pd;
-               if (block == -2) return (pd+1) % raid_disks;
+               if (block == -1)
+                       return pd;
+               if (block == -2)
+                       return (pd+1) % raid_disks;
                if (pd == raid_disks - 1)
                        return block+1;
                if (block >= pd)
@@ -161,14 +173,18 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
 
        case 600 + ALGORITHM_LEFT_SYMMETRIC:
                pd = raid_disks - 1 - (stripe % raid_disks);
-               if (block == -1) return pd;
-               if (block == -2) return (pd+1) % raid_disks;
+               if (block == -1)
+                       return pd;
+               if (block == -2)
+                       return (pd+1) % raid_disks;
                return (pd + 2 + block) % raid_disks;
 
        case 600 + ALGORITHM_RIGHT_SYMMETRIC:
                pd = stripe % raid_disks;
-               if (block == -1) return pd;
-               if (block == -2) return (pd+1) % raid_disks;
+               if (block == -1)
+                       return pd;
+               if (block == -2)
+                       return (pd+1) % raid_disks;
                return (pd + 2 + block) % raid_disks;
 
        case 600 + ALGORITHM_ROTATING_N_RESTART:
@@ -177,8 +193,10 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
                 * Q D D D P
                 */
                pd = raid_disks - 1 - ((stripe + 1) % raid_disks);
-               if (block == -1) return pd;
-               if (block == -2) return (pd+1) % raid_disks;
+               if (block == -1)
+                       return pd;
+               if (block == -2)
+                       return (pd+1) % raid_disks;
                if (pd == raid_disks - 1)
                        return block+1;
                if (block >= pd)
@@ -188,8 +206,10 @@ int geo_map(int block, unsigned long long stripe, int raid_disks,
        case 600 + ALGORITHM_ROTATING_N_CONTINUE:
                /* Same as left_symmetric but Q is before P */
                pd = raid_disks - 1 - (stripe % raid_disks);
-               if (block == -1) return pd;
-               if (block == -2) return (pd+raid_disks-1) % raid_disks;
+               if (block == -1)
+                       return pd;
+               if (block == -2)
+                       return (pd+raid_disks-1) % raid_disks;
                return (pd + 1 + block) % raid_disks;
        }
        return -1;
@@ -354,6 +374,12 @@ void raid6_2data_recov(int disks, size_t bytes, int faila, int failb,
        const uint8_t *pbmul;   /* P multiplier table for B data */
        const uint8_t *qmul;            /* Q multiplier table (for both) */
 
+       if (faila > failb) {
+               int t = faila;
+               faila = failb;
+               failb = t;
+       }
+
        if (neg_offset) {
                p = ptrs[-1];
                q = ptrs[-2];
@@ -428,7 +454,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;
@@ -456,7 +482,7 @@ int raid6_check_disks(int data_disks, int start, int chunk_size,
                }
 
                if((Px == 0) && (Qx == 0))
-                       curr_broken_disk = curr_broken_disk;
+                       curr_broken_disk = prev_broken_disk;
 
                if(curr_broken_disk >= data_disks + 2)
                        broken_status = 2;
@@ -555,14 +581,16 @@ int save_stripes(int *source, unsigned long long *offsets,
                                       raid_disks, level, layout);
                        if (dnum < 0) abort();
                        if (source[dnum] < 0 ||
-                           lseek64(source[dnum], offsets[dnum]+offset, 0) < 0 ||
-                           read(source[dnum], buf+disk * chunk_size, chunk_size)
-                           != chunk_size)
+                           lseek64(source[dnum],
+                                   offsets[dnum] + offset, 0) < 0 ||
+                           read(source[dnum], buf+disk * chunk_size,
+                                chunk_size) != chunk_size) {
                                if (failed <= 2) {
                                        fdisk[failed] = dnum;
                                        fblock[failed] = disk;
                                        failed++;
                                }
+                       }
                }
                if (failed == 0 || fblock[0] >= data_disks)
                        /* all data disks are good */
@@ -651,11 +679,6 @@ int save_stripes(int *source, unsigned long long *offsets,
                                raid6_datap_recov(syndrome_disks+2, chunk_size,
                                                  fdisk[0], bufs, 0);
                        else {
-                               if (fdisk[0] > fdisk[1]) {
-                                       int t = fdisk[0];
-                                       fdisk[0] = fdisk[1];
-                                       fdisk[1] = t;
-                               }
                                /* Two data blocks failed, P,Q OK */
                                raid6_2data_recov(syndrome_disks+2, chunk_size,
                                                  fdisk[0], fdisk[1], bufs, 0);
@@ -710,8 +733,8 @@ int restore_stripes(int *dest, unsigned long long *offsets,
                zero_size = chunk_size;
        }
 
-       if (stripe_buf == NULL || stripes == NULL || blocks == NULL
-           || zero == NULL) {
+       if (stripe_buf == NULL || stripes == NULL || blocks == NULL ||
+           zero == NULL) {
                rv = -2;
                goto abort;
        }
@@ -826,8 +849,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;