summaryrefslogtreecommitdiffstats
path: root/xlators/features
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2015-11-17 17:01:47 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-03-04 17:26:21 -0800
commit9504c104d16856095ee99180d38aef02e51b0d60 (patch)
treec25846eb3938fadc5e58133abe99c5790fcd94c4 /xlators/features
parent49da065720919faeb98bae418eccb24498230788 (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> BUG: 1283757 Change-Id: Ic20d4ee031265305db1a6ed2cf591ce94b7d0749 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/12668 Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/features')
-rw-r--r--xlators/features/changelog/src/changelog-helpers.h2
-rw-r--r--xlators/features/changetimerecorder/src/ctr-helper.h2
-rw-r--r--xlators/features/marker/src/marker.c2
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 d88dbaa0c15..b4f0ed053ae 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -625,7 +625,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 cf71337a8f5..e80bb2d7cb7 100644
--- a/xlators/features/changetimerecorder/src/ctr-helper.h
+++ b/xlators/features/changetimerecorder/src/ctr-helper.h
@@ -341,7 +341,7 @@ out:
* 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 ebe18d613c5..4a50d275a89 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -993,7 +993,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,