summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/dict.c
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2014-08-29 10:42:02 +0000
committerVijay Bellur <vbellur@redhat.com>2014-09-29 01:13:08 -0700
commit2a2f1130689d388f26b41f5df3e0bf572e0addb5 (patch)
tree7cef3f717baaea3969348d7c9668f6971416c503 /libglusterfs/src/dict.c
parent7113d873af1f129effd8c6da21b49e797de8eab0 (diff)
glusterfs: allow setxattr of keys with null values.
Disk based file systems allow to get/set extended attribute key-value pairs where value can be null. Fuse/libgfapi clients must be able to do the same on a gluster volume. Change-Id: Ifc11134cc07f1a3ede43f9d027554dcd10b5c930 BUG: 1135514 Signed-off-by: Ravishankar N <ravishankar@redhat.com> Reviewed-on: http://review.gluster.org/8567 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'libglusterfs/src/dict.c')
-rw-r--r--libglusterfs/src/dict.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libglusterfs/src/dict.c b/libglusterfs/src/dict.c
index cf4a3ce644c..5062f509940 100644
--- a/libglusterfs/src/dict.c
+++ b/libglusterfs/src/dict.c
@@ -2452,13 +2452,10 @@ _dict_serialize (dict_t *this, char *buf)
buf += keylen;
*buf++ = '\0';
- if (!pair->value->data) {
- gf_log ("dict", GF_LOG_ERROR,
- "pair->value->data is null!");
- goto out;
+ if (pair->value->data) {
+ memcpy (buf, pair->value->data, vallen);
+ buf += vallen;
}
- memcpy (buf, pair->value->data, vallen);
- buf += vallen;
pair = pair->next;
count--;