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-dir-read.c | |
| 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-dir-read.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-read.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c index 3f056b686..9e799b858 100644 --- a/xlators/cluster/afr/src/afr-dir-read.c +++ b/xlators/cluster/afr/src/afr-dir-read.c @@ -51,7 +51,8 @@ int -afr_examine_dir_sh_unwind (call_frame_t *frame, xlator_t *this) +afr_examine_dir_sh_unwind (call_frame_t *frame, xlator_t *this, int32_t op_ret, + int32_t op_errno) { afr_local_t *local = NULL; @@ -177,7 +178,7 @@ out: " forced merge option set", sh_type_str, local->loc.path); - afr_self_heal (frame, this); + afr_self_heal (frame, this, local->fd->inode); } else { afr_set_opendir_done (this, local->fd->inode); |