From: Sage Weil Date: Thu, 9 Apr 2015 17:00:54 +0000 (-0700) Subject: os/chain_xattr: s/ENODATA/ENOATTR/ X-Git-Tag: v9.0.2~92^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2cd80c0e030fe19a4ec8955237dd029fec62935;p=ceph.git os/chain_xattr: s/ENODATA/ENOATTR/ ENOATTR == ENODATA on Linux; other systems return ENOATTR. Signed-off-by: Sage Weil --- diff --git a/src/os/chain_xattr.cc b/src/os/chain_xattr.cc index f50a9ccf011d..24b463435b44 100644 --- a/src/os/chain_xattr.cc +++ b/src/os/chain_xattr.cc @@ -138,7 +138,7 @@ int chain_getxattr(const char *fn, const char *name, void *val, size_t size) get_raw_xattr_name(name, i, raw_name, sizeof(raw_name)); r = sys_getxattr(fn, raw_name, (char *)val + pos, chunk_size); - if (i && r == -ENODATA) { + if (i && r == -ENOATTR) { ret = pos; break; } @@ -209,7 +209,7 @@ int chain_fgetxattr(int fd, const char *name, void *val, size_t size) get_raw_xattr_name(name, i, raw_name, sizeof(raw_name)); r = sys_fgetxattr(fd, raw_name, (char *)val + pos, chunk_size); - if (i && r == -ENODATA) { + if (i && r == -ENOATTR) { ret = pos; break; } @@ -282,10 +282,10 @@ int chain_setxattr(const char *fn, const char *name, const void *val, size_t siz do { get_raw_xattr_name(name, i, raw_name, sizeof(raw_name)); r = sys_removexattr(fn, raw_name); - if (r < 0 && r != -ENODATA) + if (r < 0 && r != -ENOATTR) ret = r; i++; - } while (r != -ENODATA); + } while (r != -ENOATTR); } return ret; @@ -318,10 +318,10 @@ int chain_fsetxattr(int fd, const char *name, const void *val, size_t size) do { get_raw_xattr_name(name, i, raw_name, sizeof(raw_name)); r = sys_fremovexattr(fd, raw_name); - if (r < 0 && r != -ENODATA) + if (r < 0 && r != -ENOATTR) ret = r; i++; - } while (r != -ENODATA); + } while (r != -ENOATTR); } return ret;