From ed74054de625f7ad61049e3e1a8737da5daaa4ee Mon Sep 17 00:00:00 2001 From: Mohammed Junaid Date: Mon, 19 Mar 2012 11:34:42 +0530 Subject: features/marker: Replacing -1 with GF_CLIENT_PID_GSYNCD as part of code cleanup. To Keep the code(rel-3.2) consistent with the master(rel-3.3) branch. Change-Id: I6a052a35abf022d5551ec9b59db0ae19f81f326d BUG: 769494 Signed-off-by: Mohammed Junaid Reviewed-on: http://review.gluster.org/2969 Tested-by: Gluster Build System Reviewed-by: Csaba Henk --- libglusterfs/src/common-utils.h | 4 ++++ xlators/features/marker/src/marker.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index 272beee2d77..8511e8d319a 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -78,6 +78,10 @@ enum _gf_boolean _gf_true = 1 }; +enum _gf_client_pid { + GF_CLIENT_PID_GSYNCD = -1, +}; + typedef enum _gf_boolean gf_boolean_t; typedef int (*gf_cmp) (void *, void *); diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 9e5fe363a61..d2a6c4e141d 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -253,7 +253,7 @@ call_from_special_client (call_frame_t *frame, xlator_t *this, const char *name) priv = (marker_conf_t *)this->private; - if (frame->root->pid != -1 || name == NULL || + if (frame->root->pid != GF_CLIENT_PID_GSYNCD || name == NULL || strcmp (name, MARKER_XATTR_PREFIX "." VOLUME_MARK) != 0) { ret = _gf_false; goto out; @@ -434,7 +434,7 @@ marker_xtime_update_marks (xlator_t *this, marker_local_t *local) GF_VALIDATE_OR_GOTO ("marker", this, out); GF_VALIDATE_OR_GOTO (this->name, local, out); - if (local->pid == -1) + if (local->pid == GF_CLIENT_PID_GSYNCD) goto out; marker_gettimeofday (local); @@ -1769,7 +1769,7 @@ call_from_sp_client_to_reset_tmfile (call_frame_t *frame, if (data == NULL) return -1; - if (frame->root->pid != -1) { + if (frame->root->pid != GF_CLIENT_PID_GSYNCD) { op_ret = -1; op_errno = EPERM; -- cgit