From 4e8901f7201ec68f30dbdf452362fcf0f3ec16bc Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Wed, 5 Nov 2014 09:04:50 +0530 Subject: storage/posix: Treat ENODATA/ENOATTR as success in bulk removexattr Backport of http://review.gluster.org/9049 Bulk remove xattr is internal fop in gluster. Some of the xattrs may have special behavior. Ex: removexattr("posix.system_acl_access"), removes more than one xattr on the file that could be present in the bulk-removal request. Removexattr of these deleted xattrs will fail with either ENODATA/ENOATTR. Since all this fop cares is removal of the xattrs in bulk-remove request and if they are already deleted, it can be treated as success. BUG: 1163571 Change-Id: I009f4736f8b6362d7115f57a7d7aece74e56e4f6 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/9109 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/storage/posix/src/posix.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'xlators/storage') diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index 3e3d14fc793..d8599881fb7 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -4170,7 +4170,21 @@ _posix_remove_xattr (dict_t *dict, char *key, data_t *value, void *data) key = newkey; } #endif + /* Bulk remove xattr is internal fop in gluster. Some of the xattrs may + * have special behavior. Ex: removexattr("posix.system_acl_access"), + * removes more than one xattr on the file that could be present in the + * bulk-removal request. Removexattr of these deleted xattrs will fail + * with either ENODATA/ENOATTR. Since all this fop cares is removal of the + * xattrs in bulk-remove request and if they are already deleted, it can be + * treated as success. + */ + op_ret = sys_lremovexattr (filler->real_path, key); + if (op_ret == -1) { + if (errno == ENODATA || errno == ENOATTR) + op_ret = 0; + } + if (op_ret == -1) { filler->op_errno = errno; if (errno != ENOATTR && errno != ENODATA && errno != EPERM) -- cgit