diff options
| author | Kotresh HR <khiremat@redhat.com> | 2016-03-21 12:01:47 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2016-05-03 22:46:21 -0700 |
| commit | 5cd344b610c814df8375db7c3144df97766b47bd (patch) | |
| tree | d346acdf15d5bd5394e0e752295047591dee1e3f | |
| parent | d67d30e63f11d926ca8e46ea208758703566a76f (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>
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 1 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index 67bfd5ad260..fb4bddbd1e0 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -158,6 +158,7 @@ #define GLUSTERFS_INODELK_DOM_COUNT "glusterfs.inodelk-dom-count" #define GFID_TO_PATH_KEY "glusterfs.gfid2path" #define GF_XATTR_STIME_PATTERN "trusted.glusterfs.*.stime" +#define GF_XATTR_XTIME_PATTERN "trusted.glusterfs.*.xtime" #define GF_XATTR_TRIGGER_SYNC "glusterfs.geo-rep.trigger-sync" /* quota xattrs */ 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; } |