diff options
| author | Vikas Gorur <vikas@gluster.com> | 2009-04-09 03:53:26 -0700 |
|---|---|---|
| committer | Anand V. Avati <avati@amp.gluster.com> | 2009-04-09 18:57:01 +0530 |
| commit | ec35b79f746d8a9451d7a3b9894025fdad7382f4 (patch) | |
| tree | 9396c57dfee291eee6539dd602a34ef2b59d04bc /xlators/cluster/afr/src/afr-self-heal-common.c | |
| parent | 445b57bf7207107a9ef078697b7d03bb9349747a (diff) | |
Erase xattr during self-heal based on original dict.
Decrement xattr during self-heal based on the original dict instead
of pending_matrix, as the pending_matrix might have been
altered later.
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-common.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 518907ac7..eba1099b3 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -466,12 +466,16 @@ out: void -afr_sh_pending_to_delta (int32_t *pending_matrix[], int32_t *delta_matrix[], - int success[], int child_count) +afr_sh_pending_to_delta (dict_t **xattr, char *key, + int32_t *delta_matrix[], int success[], + int child_count) { int i = 0; int j = 0; + int32_t * pending = NULL; + int ret = 0; + /* start clean */ for (i = 0; i < child_count; i++) { for (j = 0; j < child_count; j++) { @@ -480,10 +484,20 @@ afr_sh_pending_to_delta (int32_t *pending_matrix[], int32_t *delta_matrix[], } for (i = 0; i < child_count; i++) { + pending = NULL; + + ret = dict_get_ptr (xattr[i], (char *) key, + VOID (&pending)); + for (j = 0; j < child_count; j++) { if (!success[j]) continue; - delta_matrix[i][j] = -pending_matrix[i][j]; + + if (pending) { + delta_matrix[i][j] = -(ntoh32 (pending[j])); + } else { + delta_matrix[i][j] = 0; + } } } } |