diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-07-01 14:25:07 +0530 |
|---|---|---|
| committer | Xavier Hernandez <xhernandez@datalab.es> | 2015-07-14 04:14:38 -0700 |
| commit | 7766c0df5509e8acb6768c69d3f5642909781135 (patch) | |
| tree | 2ef8ab0f8bc7bdc31d1d3d5176d3e8b46c6944cb /xlators/cluster/ec/src/ec-dir-read.c | |
| parent | 84ecb016cd2f1c8853c22e2df7d44d6c7bf32ed7 (diff) | |
cluster/ec: wind readlink on good subvol(s)
BUG: 1232172
Change-Id: I3a56e487840d86147dd85bf5fbe79b165eae289f
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/11589
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/cluster/ec/src/ec-dir-read.c')
| -rw-r--r-- | xlators/cluster/ec/src/ec-dir-read.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/xlators/cluster/ec/src/ec-dir-read.c b/xlators/cluster/ec/src/ec-dir-read.c index 5469d62bc3f..09010d5d108 100644 --- a/xlators/cluster/ec/src/ec-dir-read.c +++ b/xlators/cluster/ec/src/ec-dir-read.c @@ -438,14 +438,9 @@ int32_t ec_manager_readdir(ec_fop_data_t * fop, int32_t state) case EC_STATE_PREPARE_ANSWER: cbk = fop->answer; if (cbk) { - if ((cbk->op_ret < 0) && - ec_is_recoverable_error (cbk->op_errno)) { - GF_ASSERT (fop->mask & (1ULL<<cbk->idx)); - fop->mask ^= (1ULL << cbk->idx); - if (fop->mask == 0) - return EC_STATE_REPORT; - return EC_STATE_DISPATCH; - } + if (ec_dispatch_one_retry (fop, cbk)) + return EC_STATE_DISPATCH; + if ((cbk->op_ret > 0) && (fop->id == GF_FOP_READDIRP)) { ec_adjust_readdirp (fop->xl->private, cbk->idx, &cbk->entries); |