diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-11-17 17:01:47 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-11-18 05:16:03 -0800 |
| commit | e06adccb38f3dc91a4534232237e07589cd07426 (patch) | |
| tree | e4d9b65ba46d09879e64cee20bfe8283fa877e0d /xlators/features | |
| parent | 92919e7de3d9ceaa70d4103266fc438dd28441cc (diff) | |
cluster/ec: Mark self-heal fops as internal
Change-Id: I8ae7af266d3e00460f0cfdc9389a926e5f2fee36
BUG: 1282761
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/12598
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/changelog/src/changelog-helpers.h | 2 | ||||
| -rw-r--r-- | xlators/features/changetimerecorder/src/ctr-helper.h | 2 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h index 7d1a86e7b33..df307382d34 100644 --- a/xlators/features/changelog/src/changelog-helpers.h +++ b/xlators/features/changelog/src/changelog-helpers.h @@ -626,7 +626,7 @@ resolve_pargfid_to_path (xlator_t *this, uuid_t gfid, char **path, char *bname); * ignore internal fops for all clients except AFR self-heal daemon */ #define CHANGELOG_IF_INTERNAL_FOP_THEN_GOTO(frame, dict, label) do { \ - if ((frame->root->pid != GF_CLIENT_PID_AFR_SELF_HEALD) \ + if ((frame->root->pid != GF_CLIENT_PID_SELF_HEALD) \ && dict \ && dict_get (dict, GLUSTERFS_INTERNAL_FOP_KEY)) \ goto label; \ diff --git a/xlators/features/changetimerecorder/src/ctr-helper.h b/xlators/features/changetimerecorder/src/ctr-helper.h index 161fff2d774..6ddc5b8ca19 100644 --- a/xlators/features/changetimerecorder/src/ctr-helper.h +++ b/xlators/features/changetimerecorder/src/ctr-helper.h @@ -278,7 +278,7 @@ do {\ * If its a AFR SELF HEAL * */ #define AFR_SELF_HEAL_FOP(frame)\ - (frame->root->pid == GF_CLIENT_PID_AFR_SELF_HEALD) + (frame->root->pid == GF_CLIENT_PID_SELF_HEALD) /* * if a rebalancer fop goto diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 77d8a89abd0..e388bf85d2b 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -991,7 +991,7 @@ marker_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, marker_conf_t *priv = NULL; marker_local_t *local = NULL; uint32_t nlink = -1; - int32_t ret = 0; + GF_UNUSED int32_t ret = 0; if (op_ret == -1) { gf_log (this->name, GF_LOG_TRACE, |