diff options
author | Pranith K <pranithk@gluster.com> | 2011-07-14 06:30:20 +0000 |
---|---|---|
committer | Vijay Bellur <vijay@gluster.com> | 2011-10-19 02:28:02 -0700 |
commit | 94943e213a61c83481308dba6adc6b23c3581d2e (patch) | |
tree | a1664c9d3e16d6278d996f4f8c148ffcef39acf6 /xlators/cluster/afr/src/afr-self-heal.h | |
parent | 449f31c8ae8f1e6df787cfc1d1203ba7f0312cb6 (diff) |
cluster/afr: Fix conflict files and gfids
Change-Id: I771045aca9f9a811744aeec0d844609a37ae4792
BUG: 3734
Reviewed-on: http://review.gluster.com/611
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal.h')
-rw-r--r-- | xlators/cluster/afr/src/afr-self-heal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h index 00e9a1b1e..5b211499a 100644 --- a/xlators/cluster/afr/src/afr-self-heal.h +++ b/xlators/cluster/afr/src/afr-self-heal.h @@ -50,7 +50,7 @@ afr_self_heal_find_sources (xlator_t *this, afr_local_t *local, dict_t **xattr, afr_transaction_type transaction_type); int -afr_self_heal (call_frame_t *frame, xlator_t *this); +afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode); gf_boolean_t afr_is_fresh_read_child (int32_t *sources, int32_t child_count, |