@@ -62,8 +62,7 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
const char *pool_name;
const char *ns_field = " pool_namespace=";
char buf[128];
- size_t len, total_len = 0;
- int ret;
+ size_t ret, len, total_len = 0;
pool_ns = ceph_try_get_string(ci->i_layout.pool_ns);
@@ -87,11 +86,8 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
if (pool_ns)
total_len += strlen(ns_field) + pool_ns->len;
- if (!size) {
- ret = total_len;
- } else if (total_len > size) {
- ret = -ERANGE;
- } else {
+ ret = total_len;
+ if (size >= total_len) {
memcpy(val, buf, len);
ret = len;
if (pool_name) {
Currently it returns -ERANGE if it thinks that the buffer won't fit, but the function returns size_t which is unsigned. Fix it to just return the length in this case like the other xattrs do, and rely on the caller to handle the case where it won't fit in the destination buffer. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/ceph/xattr.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)