From 5cd344b610c814df8375db7c3144df97766b47bd Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Mon, 21 Mar 2016 12:01:47 +0530 Subject: features/marker: Fix dict_get errors when key is NULL Backport of: >Change-Id: I25e497459441334c13af77b3fec83c42a7a92ac4 >BUG: 1319581 >Signed-off-by: Kotresh HR >Reviewed-on: http://review.gluster.org/13793 >Smoke: Gluster Build System >Tested-by: Vijaikumar Mallikarjuna >Reviewed-by: Vijaikumar Mallikarjuna >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System >Reviewed-by: Venky Shankar >Signed-off-by: Kotresh HR Change-Id: I8054ffab3574b6ceb1c7d4290e9f6de3dbf38724 BUG: 1332074 Signed-off-by: Kotresh HR Reviewed-on: http://review.gluster.org/14144 Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Venky Shankar --- xlators/features/marker/src/marker.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xlators/features') diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index 10bf531cdd7..6a1952c41cb 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; } -- cgit