Commit 0aeff37a authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov

ceph: fix setting empty extended attribute

make sure 'value' is not null. otherwise __ceph_setxattr will remove
the extended attribute.
Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
Reviewed-by: default avatarSage Weil <sage@redhat.com>
parent 275dd19e
...@@ -854,7 +854,7 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name, ...@@ -854,7 +854,7 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name,
struct ceph_pagelist *pagelist = NULL; struct ceph_pagelist *pagelist = NULL;
int err; int err;
if (value) { if (size > 0) {
/* copy value into pagelist */ /* copy value into pagelist */
pagelist = kmalloc(sizeof(*pagelist), GFP_NOFS); pagelist = kmalloc(sizeof(*pagelist), GFP_NOFS);
if (!pagelist) if (!pagelist)
...@@ -864,7 +864,7 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name, ...@@ -864,7 +864,7 @@ static int ceph_sync_setxattr(struct dentry *dentry, const char *name,
err = ceph_pagelist_append(pagelist, value, size); err = ceph_pagelist_append(pagelist, value, size);
if (err) if (err)
goto out; goto out;
} else { } else if (!value) {
flags |= CEPH_XATTR_REMOVE; flags |= CEPH_XATTR_REMOVE;
} }
...@@ -1001,6 +1001,9 @@ int ceph_setxattr(struct dentry *dentry, const char *name, ...@@ -1001,6 +1001,9 @@ int ceph_setxattr(struct dentry *dentry, const char *name,
if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN)) if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
return generic_setxattr(dentry, name, value, size, flags); return generic_setxattr(dentry, name, value, size, flags);
if (size == 0)
value = ""; /* empty EA, do not remove */
return __ceph_setxattr(dentry, name, value, size, flags); return __ceph_setxattr(dentry, name, value, size, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment