diff options
| author | Csaba Henk <csaba@redhat.com> | 2013-03-01 09:55:44 +0100 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-03-03 20:35:48 -0800 |
| commit | 8203d34f5017034d1696c24dc78de16430df70ba (patch) | |
| tree | 49d083e5e3fdb9706288d5422104dbfd80df6d6d | |
| parent | 9636e63913c98740cb428c026ea5f88a816d527e (diff) | |
cluster xlators: s/-1/GF_CLIENT_PID_GSYNCD/
Change-Id: I03be3cb23684de4ab36cf2953002708466edd580
BUG: 765433
Signed-off-by: Csaba Henk <csaba@redhat.com>
Reviewed-on: http://review.gluster.org/4601
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-read.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/stripe/src/stripe.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index c798e1932..051b7b164 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -1436,7 +1436,7 @@ afr_getxattr (call_frame_t *frame, xlator_t *this, goto out; } if ((strcmp (GF_XATTR_MARKER_KEY, name) == 0) - && (-1 == frame->root->pid)) { + && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) { local->marker.call_count = priv->child_count; @@ -1486,7 +1486,7 @@ afr_getxattr (call_frame_t *frame, xlator_t *this, if (*priv->vol_uuid) { if ((match_uuid_local (name, priv->vol_uuid) == 0) - && (-1 == frame->root->pid)) { + && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) { local->marker.call_count = priv->child_count; sub_volumes = alloca ( priv->child_count diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index aed81b83e..f95bb84e6 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -2169,7 +2169,7 @@ dht_getxattr (call_frame_t *frame, xlator_t *this, } if (key && (!strcmp (GF_XATTR_MARKER_KEY, key)) - && (-1 == frame->root->pid)) { + && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) { if (DHT_IS_DIR(layout)) { cnt = layout->cnt; } else { @@ -2193,7 +2193,7 @@ dht_getxattr (call_frame_t *frame, xlator_t *this, if (key && *conf->vol_uuid) { if ((match_uuid_local (key, conf->vol_uuid) == 0) && - (-1 == frame->root->pid)) { + (GF_CLIENT_PID_GSYNCD == frame->root->pid)) { if (DHT_IS_DIR(layout)) { cnt = layout->cnt; } else { diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index b3e87d31b..dadd3fec5 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -3982,7 +3982,7 @@ stripe_setxattr (call_frame_t *frame, xlator_t *this, * Set xattrs for directories on all subvolumes. Additionally * this power is only given to a special client. */ - if ((frame->root->pid == -1) && IA_ISDIR (loc->inode->ia_type)) { + if ((frame->root->pid == GF_CLIENT_PID_GSYNCD) && IA_ISDIR (loc->inode->ia_type)) { for (i = 0; i < priv->child_count; i++, trav = trav->next) { STACK_WIND (frame, stripe_setxattr_cbk, trav->xlator, trav->xlator->fops->setxattr, @@ -4954,7 +4954,7 @@ stripe_getxattr (call_frame_t *frame, xlator_t *this, if (name && (strcmp (GF_XATTR_MARKER_KEY, name) == 0) - && (-1 == frame->root->pid)) { + && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) { local->marker.call_count = priv->child_count; sub_volumes = alloca ( priv->child_count * @@ -5025,7 +5025,7 @@ stripe_getxattr (call_frame_t *frame, xlator_t *this, if (name &&(*priv->vol_uuid)) { if ((match_uuid_local (name, priv->vol_uuid) == 0) - && (-1 == frame->root->pid)) { + && (GF_CLIENT_PID_GSYNCD == frame->root->pid)) { if (!IA_FILE_OR_DIR (loc->inode->ia_type)) local->marker.call_count = 1; |