summaryrefslogtreecommitdiffstats
path: root/xlators/features/marker
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2016-03-21 12:01:47 +0530
committerVenky Shankar <vshankar@redhat.com>2016-05-03 22:46:21 -0700
commit5cd344b610c814df8375db7c3144df97766b47bd (patch)
treed346acdf15d5bd5394e0e752295047591dee1e3f /xlators/features/marker
parentd67d30e63f11d926ca8e46ea208758703566a76f (diff)
features/marker: Fix dict_get errors when key is NULL
Backport of: >Change-Id: I25e497459441334c13af77b3fec83c42a7a92ac4 >BUG: 1319581 >Signed-off-by: Kotresh HR <khiremat@redhat.com> >Reviewed-on: http://review.gluster.org/13793 >Smoke: Gluster Build System <jenkins@build.gluster.com> >Tested-by: Vijaikumar Mallikarjuna <vmallika@redhat.com> >Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.com> >Reviewed-by: Venky Shankar <vshankar@redhat.com> >Signed-off-by: Kotresh HR <khiremat@redhat.com> Change-Id: I8054ffab3574b6ceb1c7d4290e9f6de3dbf38724 BUG: 1332074 Signed-off-by: Kotresh HR <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/14144 Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/features/marker')
-rw-r--r--xlators/features/marker/src/marker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 10bf531..6a1952c 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -424,10 +424,10 @@ marker_filter_gsyncd_xattrs (call_frame_t *frame,
priv = this->private;
GF_ASSERT (priv);
+ GF_ASSERT (frame);
- if (frame->root->pid != GF_CLIENT_PID_GSYNCD &&
- dict_get(xattrs, priv->marker_xattr)) {
- dict_del (xattrs, priv->marker_xattr);
+ if (xattrs && frame->root->pid != GF_CLIENT_PID_GSYNCD) {
+ GF_REMOVE_INTERNAL_XATTR (GF_XATTR_XTIME_PATTERN, xattrs);
}
return;
}