diff options
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 16 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 1 | 
2 files changed, 1 insertions, 16 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 01341526097..64e22c3229e 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -543,7 +543,6 @@ static void  afr_lookup_collect_xattr (afr_local_t *local, xlator_t *this,                            int child_index, dict_t *xattr)  { -        uint32_t        open_fd_count = 0;          uint32_t        inodelk_count = 0;          uint32_t        entrylk_count = 0; @@ -568,11 +567,6 @@ afr_lookup_collect_xattr (afr_local_t *local, xlator_t *this,                         "data self-heal is pending for %s.", local->loc.path);          } -        ret = dict_get_uint32 (xattr, GLUSTERFS_OPEN_FD_COUNT, -                               &open_fd_count); -        if (ret == 0) -                local->open_fd_count += open_fd_count; -          ret = dict_get_uint32 (xattr, GLUSTERFS_INODELK_COUNT,                                 &inodelk_count);          if (ret == 0) @@ -685,9 +679,7 @@ afr_lookup_done (call_frame_t *frame, xlator_t *this, struct iatt *lookup_buf)              && ((!local->cont.lookup.is_revalidate)                  || (local->op_ret != -1))) { -                if (local->open_fd_count -                    || local->inodelk_count -                    || local->entrylk_count) { +                if (local->inodelk_count || local->entrylk_count) {                          /* Someone else is doing self-heal on this file.                             So just make a best effort to set the read-subvolume @@ -1105,12 +1097,6 @@ afr_lookup (call_frame_t *frame, xlator_t *this,                  /* 3 = data+metadata+entry */          } -        ret = dict_set_uint64 (local->xattr_req, GLUSTERFS_OPEN_FD_COUNT, 0); -        if (ret < 0) { -                gf_log (this->name, GF_LOG_WARNING, -                        "Unable to set dict value."); -        } -          ret = dict_set_uint64 (local->xattr_req, GLUSTERFS_INODELK_COUNT, 0);          if (ret < 0) {                  gf_log (this->name, GF_LOG_WARNING, diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index e64a6fe1529..26f2c989f4e 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -293,7 +293,6 @@ typedef struct _afr_local {  	int32_t *child_errno;  	dict_t  *xattr_req; -	int      open_fd_count;  	int32_t  inodelk_count;  	int32_t  entrylk_count;  | 
