From ac750cebc20485869f4cc0600b8c79274e1f50b5 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Fri, 8 Apr 2016 13:01:07 -0700 Subject: [PATCH] chain_[f]getxattr: always use size, no reaon to consider CHAIN_XATTR_MAX_BLOCK_LEN Users of setxattr can now set attrs larger than that size. Signed-off-by: Samuel Just --- src/os/filestore/chain_xattr.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/filestore/chain_xattr.cc b/src/os/filestore/chain_xattr.cc index ce915fc63dede..01d28fc2fe751 100644 --- a/src/os/filestore/chain_xattr.cc +++ b/src/os/filestore/chain_xattr.cc @@ -135,7 +135,7 @@ int chain_getxattr(const char *fn, const char *name, void *val, size_t size) return getxattr_len(fn, name); do { - chunk_size = (size < CHAIN_XATTR_MAX_BLOCK_LEN ? size : CHAIN_XATTR_MAX_BLOCK_LEN); + chunk_size = size; get_raw_xattr_name(name, i, raw_name, sizeof(raw_name)); r = sys_getxattr(fn, raw_name, (char *)val + pos, chunk_size); @@ -206,7 +206,7 @@ int chain_fgetxattr(int fd, const char *name, void *val, size_t size) return chain_fgetxattr_len(fd, name); do { - chunk_size = (size < CHAIN_XATTR_MAX_BLOCK_LEN ? size : CHAIN_XATTR_MAX_BLOCK_LEN); + chunk_size = size; get_raw_xattr_name(name, i, raw_name, sizeof(raw_name)); r = sys_fgetxattr(fd, raw_name, (char *)val + pos, chunk_size); -- 2.39.5