From dff8a2dfa1f1933ee04eff55d90efa0ffd11cdd1 Mon Sep 17 00:00:00 2001 From: Lucian Petrut Date: Mon, 12 Sep 2022 13:00:39 +0000 Subject: [PATCH] test/libcephfs: use CEPHFS_E* errors The cephfs client now uses CEPHFS_E errors (based on Linux) instead of the platform specific errno values. This change updates the libcephfs tests accordingly. Signed-off-by: Lucian Petrut --- src/test/libcephfs/access.cc | 40 ++-- src/test/libcephfs/acl.cc | 29 +-- src/test/libcephfs/deleg.cc | 9 +- src/test/libcephfs/flock.cc | 43 ++-- src/test/libcephfs/monconfig.cc | 3 +- src/test/libcephfs/newops.cc | 13 +- src/test/libcephfs/quota.cc | 2 +- src/test/libcephfs/readdir_r_cb.cc | 3 +- src/test/libcephfs/reclaim.cc | 3 +- src/test/libcephfs/recordlock.cc | 33 +-- src/test/libcephfs/test.cc | 348 ++++++++++++++--------------- src/test/libcephfs/vxattr.cc | 9 +- 12 files changed, 272 insertions(+), 263 deletions(-) diff --git a/src/test/libcephfs/access.cc b/src/test/libcephfs/access.cc index 7338739fa95..dd4f33ab079 100644 --- a/src/test/libcephfs/access.cc +++ b/src/test/libcephfs/access.cc @@ -61,7 +61,7 @@ int do_mon_command(string s, string *key) std::cout << "key: " << *key << std::endl; free(outbuf); } else { - return -EINVAL; + return -CEPHFS_EINVAL; } if (outs_len) { string s(outs, outs_len); @@ -180,9 +180,9 @@ TEST(AccessTest, Path) { ASSERT_EQ(ceph_rename(admin, string(good + "/renameme").c_str(), string(bad + "/asdf").c_str()), 0); ASSERT_GE(ceph_write(cmount, fd, "foo", 3, 0), 0); - ASSERT_GE(ceph_fchmod(cmount, fd, 0777), -EACCES); - ASSERT_GE(ceph_ftruncate(cmount, fd, 0), -EACCES); - ASSERT_GE(ceph_fsetxattr(cmount, fd, "user.any", "bar", 3, 0), -EACCES); + ASSERT_GE(ceph_fchmod(cmount, fd, 0777), -CEPHFS_EACCES); + ASSERT_GE(ceph_ftruncate(cmount, fd, 0), -CEPHFS_EACCES); + ASSERT_GE(ceph_fsetxattr(cmount, fd, "user.any", "bar", 3, 0), -CEPHFS_EACCES); ceph_close(cmount, fd); ceph_shutdown(cmount); @@ -265,7 +265,7 @@ TEST(AccessTest, User) { ASSERT_EQ(0, ceph_conf_read_file(cmount, NULL)); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(0, ceph_conf_set(cmount, "key", key.c_str())); - ASSERT_EQ(-EACCES, ceph_mount(cmount, "/")); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mount(cmount, "/")); ASSERT_EQ(0, ceph_init(cmount)); UserPerm *perms = ceph_userperm_new(123, 456, 0, NULL); @@ -281,35 +281,35 @@ TEST(AccessTest, User) { ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 123, 456)); ASSERT_EQ(0, ceph_mkdir(cmount, string(dir + "/u1").c_str(), 0755)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 456)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); // group bits ASSERT_EQ(0, ceph_chmod(admin, dir.c_str(), 0770)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 456)); ASSERT_EQ(0, ceph_mkdir(cmount, string(dir + "/u2").c_str(), 0755)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 2)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); // user overrides group ASSERT_EQ(0, ceph_chmod(admin, dir.c_str(), 0470)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 123, 456)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); // other ASSERT_EQ(0, ceph_chmod(admin, dir.c_str(), 0777)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 1)); ASSERT_EQ(0, ceph_mkdir(cmount, string(dir + "/u3").c_str(), 0755)); ASSERT_EQ(0, ceph_chmod(admin, dir.c_str(), 0770)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); // user and group overrides other ASSERT_EQ(0, ceph_chmod(admin, dir.c_str(), 07)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 456)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 123, 1)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 123, 456)); - ASSERT_EQ(-EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_mkdir(cmount, string(dir + "/no").c_str(), 0755)); // chown and chgrp ASSERT_EQ(0, ceph_chmod(admin, dir.c_str(), 0700)); @@ -319,18 +319,18 @@ TEST(AccessTest, User) { ASSERT_EQ(0, ceph_chown(cmount, dir.c_str(), 123, 456)); // ASSERT_EQ(0, ceph_chown(cmount, dir.c_str(), -1, 789)); ASSERT_EQ(0, ceph_chown(cmount, dir.c_str(), -1, 456)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), 123, 1)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), 1, 456)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), 123, 1)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), 1, 456)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 1)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), 123, 456)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), 123, -1)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), -1, 456)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), 123, 456)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), 123, -1)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), -1, 456)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 1, 456)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), 123, 456)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), 123, -1)); - ASSERT_EQ(-EACCES, ceph_chown(cmount, dir.c_str(), -1, 456)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), 123, 456)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), 123, -1)); + ASSERT_EQ(-CEPHFS_EACCES, ceph_chown(cmount, dir.c_str(), -1, 456)); ASSERT_EQ(0, ceph_chown(admin, dir.c_str(), 123, 1)); ASSERT_EQ(0, ceph_chown(cmount, dir.c_str(), -1, 456)); diff --git a/src/test/libcephfs/acl.cc b/src/test/libcephfs/acl.cc index 2e5989f49ea..e263ef2fb54 100644 --- a/src/test/libcephfs/acl.cc +++ b/src/test/libcephfs/acl.cc @@ -14,6 +14,7 @@ #include "include/types.h" #include "gtest/gtest.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include "include/ceph_fs.h" #include "client/posix_acl.h" #include @@ -52,7 +53,7 @@ static int check_acl_and_mode(const void *buf, size_t size, mode_t mode) switch(tag) { case ACL_USER_OBJ: if (perm != ((mode >> 6) & 7)) - return -EINVAL; + return -CEPHFS_EINVAL; break; case ACL_USER: case ACL_GROUP: @@ -62,26 +63,26 @@ static int check_acl_and_mode(const void *buf, size_t size, mode_t mode) break; case ACL_OTHER: if (perm != (mode & 7)) - return -EINVAL; + return -CEPHFS_EINVAL; break; case ACL_MASK: mask_entry = entry; break; default: - return -EIO; + return -CEPHFS_EIO; } ++entry; } if (mask_entry) { __u16 perm = mask_entry->e_perm; if (perm != ((mode >> 3) & 7)) - return -EINVAL; + return -CEPHFS_EINVAL; } else { if (!group_entry) - return -EIO; + return -CEPHFS_EIO; __u16 perm = group_entry->e_perm; if (perm != ((mode >> 3) & 7)) - return -EINVAL; + return -CEPHFS_EINVAL; } return 0; } @@ -149,7 +150,7 @@ TEST(ACL, SetACL) { ASSERT_EQ(0, ceph_conf_set(cmount, "client_permissions", "1")); // "nobody" will be ignored on Windows #ifndef _WIN32 - ASSERT_EQ(ceph_open(cmount, test_file, O_RDWR, 0), -EACCES); + ASSERT_EQ(ceph_open(cmount, test_file, O_RDWR, 0), -CEPHFS_EACCES); #endif ASSERT_EQ(0, ceph_conf_set(cmount, "client_permissions", "0")); @@ -158,7 +159,7 @@ TEST(ACL, SetACL) { ASSERT_EQ(generate_test_acl(acl_buf, acl_buf_size, 0750), 0); // can't set default acl for non-directory - ASSERT_EQ(ceph_fsetxattr(cmount, fd, ACL_EA_DEFAULT, acl_buf, acl_buf_size, 0), -EACCES); + ASSERT_EQ(ceph_fsetxattr(cmount, fd, ACL_EA_DEFAULT, acl_buf, acl_buf_size, 0), -CEPHFS_EACCES); ASSERT_EQ(ceph_fsetxattr(cmount, fd, ACL_EA_ACCESS, acl_buf, acl_buf_size, 0), 0); int tmpfd = ceph_open(cmount, test_file, O_RDWR, 0); @@ -176,7 +177,7 @@ TEST(ACL, SetACL) { ASSERT_EQ(generate_empty_acl(acl_buf, acl_buf_size, 0600), 0); ASSERT_EQ(ceph_fsetxattr(cmount, fd, ACL_EA_ACCESS, acl_buf, acl_buf_size, 0), 0); // ACL was deleted - ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_ACCESS, NULL, 0), -ENODATA); + ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_ACCESS, NULL, 0), -CEPHFS_ENODATA); ASSERT_EQ(ceph_fstatx(cmount, fd, &stx, CEPH_STATX_MODE, 0), 0); // mode was modified according to ACL @@ -269,7 +270,7 @@ TEST(ACL, DefaultACL) { ASSERT_GT(fd, 0); // no default acl - ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_DEFAULT, NULL, 0), -ENODATA); + ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_DEFAULT, NULL, 0), -CEPHFS_ENODATA); // mode and ACL are updated ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_ACCESS, acl2_buf, acl_buf_size), acl_buf_size); @@ -305,10 +306,10 @@ TEST(ACL, Disabled) { sprintf(test_dir, "dir1_acl_disabled_%d", getpid()); ASSERT_EQ(ceph_mkdir(cmount, test_dir, 0750), 0); - ASSERT_EQ(ceph_setxattr(cmount, test_dir, ACL_EA_DEFAULT, acl_buf, acl_buf_size, 0), -EOPNOTSUPP); - ASSERT_EQ(ceph_setxattr(cmount, test_dir, ACL_EA_ACCESS, acl_buf, acl_buf_size, 0), -EOPNOTSUPP); - ASSERT_EQ(ceph_getxattr(cmount, test_dir, ACL_EA_DEFAULT, acl_buf, acl_buf_size), -EOPNOTSUPP); - ASSERT_EQ(ceph_getxattr(cmount, test_dir, ACL_EA_ACCESS, acl_buf, acl_buf_size), -EOPNOTSUPP); + ASSERT_EQ(ceph_setxattr(cmount, test_dir, ACL_EA_DEFAULT, acl_buf, acl_buf_size, 0), -CEPHFS_EOPNOTSUPP); + ASSERT_EQ(ceph_setxattr(cmount, test_dir, ACL_EA_ACCESS, acl_buf, acl_buf_size, 0), -CEPHFS_EOPNOTSUPP); + ASSERT_EQ(ceph_getxattr(cmount, test_dir, ACL_EA_DEFAULT, acl_buf, acl_buf_size), -CEPHFS_EOPNOTSUPP); + ASSERT_EQ(ceph_getxattr(cmount, test_dir, ACL_EA_ACCESS, acl_buf, acl_buf_size), -CEPHFS_EOPNOTSUPP); free(acl_buf); ceph_shutdown(cmount); diff --git a/src/test/libcephfs/deleg.cc b/src/test/libcephfs/deleg.cc index d795d6f00a8..061e13763c6 100644 --- a/src/test/libcephfs/deleg.cc +++ b/src/test/libcephfs/deleg.cc @@ -9,6 +9,7 @@ #include "gtest/gtest.h" #include "include/compat.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include "include/stat.h" #include #include @@ -52,7 +53,7 @@ static int ceph_ll_delegation_wait(struct ceph_mount_info *cmount, Fh *fh, do { ret = ceph_ll_delegation(cmount, fh, cmd, cb, priv); usleep(10000); - } while (ret == -EAGAIN && retry++ < 1000); + } while (ret == -CEPHFS_EAGAIN && retry++ < 1000); return ret; } @@ -94,7 +95,7 @@ static void open_breaker_func(struct ceph_mount_info *cmount, const char *filena for (;;) { ASSERT_EQ(ceph_ll_getattr(cmount, file, &stx, CEPH_STATX_ALL_STATS, 0, perms), 0); ret = ceph_ll_open(cmount, file, flags, &fh, perms); - if (ret != -EAGAIN) + if (ret != -CEPHFS_EAGAIN) break; ASSERT_LT(i++, MAX_WAIT); usleep(1000); @@ -151,7 +152,7 @@ static void namespace_breaker_func(struct ceph_mount_info *cmount, int cmd, cons // Bad command ceph_abort(); } - if (ret != -EAGAIN) + if (ret != -CEPHFS_EAGAIN) break; ASSERT_LT(i++, MAX_WAIT); usleep(1000); @@ -327,7 +328,7 @@ TEST(LibCephFS, DelegTimeout) { std::thread breaker1(open_breaker_func, nullptr, filename, O_RDWR, &opened); breaker1.join(); ASSERT_EQ(recalled.load(), true); - ASSERT_EQ(ceph_ll_getattr(cmount, root, &stx, 0, 0, perms), -ENOTCONN); + ASSERT_EQ(ceph_ll_getattr(cmount, root, &stx, 0, 0, perms), -CEPHFS_ENOTCONN); ceph_release(cmount); } diff --git a/src/test/libcephfs/flock.cc b/src/test/libcephfs/flock.cc index 1c400f9dc1e..367483d070c 100644 --- a/src/test/libcephfs/flock.cc +++ b/src/test/libcephfs/flock.cc @@ -20,6 +20,7 @@ #include "include/compat.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include #include #include @@ -90,12 +91,12 @@ TEST(LibCephFS, BasicLocking) { // Lock exclusively twice ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, 42)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 43)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 44)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 43)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 44)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_UN, 42)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 43)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 44)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 44)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_UN, 43)); // Lock shared three times @@ -103,14 +104,14 @@ TEST(LibCephFS, BasicLocking) { ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_SH, 43)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_SH, 44)); // And then attempt to lock exclusively - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_UN, 42)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_UN, 44)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_UN, 43)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, 45)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, 42)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, 42)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_UN, 45)); // Lock shared with upgrade to exclusive (POSIX) @@ -181,7 +182,7 @@ static void thread_ConcurrentLocking(str_ConcurrentLocking& s) { const int fd = ceph_open(cmount, s.file, O_RDWR | O_CREAT, fileMode); ASSERT_GE(fd, 0); - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, ceph_pthread_self())); PING_MAIN(1); // (1) ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, ceph_pthread_self())); @@ -251,7 +252,7 @@ TEST(LibCephFS, ConcurrentLocking) { // Wait for thread to share lock WAIT_WORKER(4); // (4) - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, ceph_pthread_self())); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, ceph_pthread_self())); @@ -274,9 +275,9 @@ TEST(LibCephFS, ConcurrentLocking) { WAIT_WORKER(6); // (6) // We no longer have the lock - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, ceph_pthread_self())); - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, ceph_pthread_self())); // Wake up thread to unlock exclusive lock @@ -335,7 +336,7 @@ TEST(LibCephFS, ThreesomeLocking) { // Wait for thread to share lock TWICE(WAIT_WORKER(4)); // (4) - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, ceph_pthread_self())); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, ceph_pthread_self())); @@ -358,9 +359,9 @@ TEST(LibCephFS, ThreesomeLocking) { TWICE(WAIT_WORKER(6); // (6) // We no longer have the lock - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, ceph_pthread_self())); - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, ceph_pthread_self())); // Wake up thread to unlock exclusive lock @@ -405,7 +406,7 @@ static void process_ConcurrentLocking(str_ConcurrentLocking& s) { ASSERT_GE(fd, 0); WAIT_MAIN(1); // (R1) - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); PING_MAIN(1); // (1) ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_EX, mypid)); @@ -490,7 +491,7 @@ TEST(LibCephFS, DISABLED_InterProcessLocking) { // Wait for process to share lock WAIT_WORKER(4); // (4) - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, mypid)); // Wake up process to unlock shared lock @@ -512,8 +513,8 @@ TEST(LibCephFS, DISABLED_InterProcessLocking) { WAIT_WORKER(6); // (6) // We no longer have the lock - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); - ASSERT_EQ(-EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, mypid)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, mypid)); // Wake up process to unlock exclusive lock PING_WORKER(4); // (R4) @@ -599,7 +600,7 @@ TEST(LibCephFS, DISABLED_ThreesomeInterProcessLocking) { // Wait for process to share lock TWICE(WAIT_WORKER(4)); // (4) - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); ASSERT_EQ(0, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, mypid)); @@ -622,9 +623,9 @@ TEST(LibCephFS, DISABLED_ThreesomeInterProcessLocking) { TWICE(WAIT_WORKER(6); // (6) // We no longer have the lock - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_EX | LOCK_NB, mypid)); - ASSERT_EQ(-EWOULDBLOCK, + ASSERT_EQ(-CEPHFS_EWOULDBLOCK, ceph_flock(cmount, fd, LOCK_SH | LOCK_NB, mypid)); // Wake up process to unlock exclusive lock diff --git a/src/test/libcephfs/monconfig.cc b/src/test/libcephfs/monconfig.cc index ed5fee94175..178278c6b65 100644 --- a/src/test/libcephfs/monconfig.cc +++ b/src/test/libcephfs/monconfig.cc @@ -15,6 +15,7 @@ #include "gtest/gtest.h" #include "include/compat.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include "common/ceph_context.h" #include #include @@ -67,7 +68,7 @@ TEST_F(MonConfig, MonAddrsMissing) { ASSERT_NE(nullptr, cct); clear_mon_config(cct); - ASSERT_EQ(-ENOENT, ceph_mount(ca, NULL)); + ASSERT_EQ(-CEPHFS_ENOENT, ceph_mount(ca, NULL)); } TEST_F(MonConfig, MonAddrsInConfigProxy) { diff --git a/src/test/libcephfs/newops.cc b/src/test/libcephfs/newops.cc index 9897cb8c6a0..2a4573b9f6a 100644 --- a/src/test/libcephfs/newops.cc +++ b/src/test/libcephfs/newops.cc @@ -19,6 +19,7 @@ #include "gmock/gmock-more-matchers.h" #include "include/compat.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include "mds/mdstypes.h" #include "include/stat.h" #include @@ -62,8 +63,8 @@ TEST(LibCephFS, NewOPs) { char value[1024] = ""; int r = ceph_getxattr(cmount, test_path, "ceph.dir.pin.random", (void*)value, sizeof(value)); - // Clients will return -ENODATA if new getvxattr op not support yet. - EXPECT_THAT(r, AnyOf(Gt(0), Eq(-ENODATA))); + // Clients will return -CEPHFS_ENODATA if new getvxattr op not support yet. + EXPECT_THAT(r, AnyOf(Gt(0), Eq(-CEPHFS_ENODATA))); } { @@ -71,13 +72,13 @@ TEST(LibCephFS, NewOPs) std::stringstream ss; ss << val; int r = ceph_setxattr(cmount, test_path, "ceph.dir.pin.random", (void*)ss.str().c_str(), strlen(ss.str().c_str()), XATTR_CREATE); - // Old cephs will return -EINVAL if not support "ceph.dir.pin.random" yet. - EXPECT_THAT(r, AnyOf(Eq(0), Eq(-EINVAL))); + // Old cephs will return -CEPHFS_EINVAL if not support "ceph.dir.pin.random" yet. + EXPECT_THAT(r, AnyOf(Eq(0), Eq(-CEPHFS_EINVAL))); char value[1024] = ""; r = ceph_getxattr(cmount, test_path, "ceph.dir.pin.random", (void*)value, sizeof(value)); - // Clients will return -ENODATA if new getvxattr op not support yet. - EXPECT_THAT(r, AnyOf(Gt(0), Eq(-ENODATA))); + // Clients will return -CEPHFS_ENODATA if new getvxattr op not support yet. + EXPECT_THAT(r, AnyOf(Gt(0), Eq(-CEPHFS_ENODATA))); } ASSERT_EQ(0, ceph_rmdir(cmount, test_path)); diff --git a/src/test/libcephfs/quota.cc b/src/test/libcephfs/quota.cc index c4d0c4c3f3b..00afb3d094f 100644 --- a/src/test/libcephfs/quota.cc +++ b/src/test/libcephfs/quota.cc @@ -90,7 +90,7 @@ TEST(LibCephFS, SnapQuota) { // ensure subdir noquota xattr under snap sprintf(c_temp, "/.snap/test_snap_dir_quota_xattr_snap_%d/test_snap_dir_quota_xattr_%d/subdir_noquota", mypid, mypid); - EXPECT_EQ(-ENODATA, ceph_getxattr(cmount, c_temp, "ceph.quota.max_bytes", (void *)gxattrv, xbuflen)); + EXPECT_EQ(-CEPHFS_ENODATA, ceph_getxattr(cmount, c_temp, "ceph.quota.max_bytes", (void *)gxattrv, xbuflen)); // listxattr() shouldn't return ceph.quota.max_bytes vxattr sprintf(c_temp, "/.snap/test_snap_dir_quota_xattr_snap_%d/test_snap_dir_quota_xattr_%d", mypid, mypid); diff --git a/src/test/libcephfs/readdir_r_cb.cc b/src/test/libcephfs/readdir_r_cb.cc index 5b17ab91f1c..959c276f15b 100644 --- a/src/test/libcephfs/readdir_r_cb.cc +++ b/src/test/libcephfs/readdir_r_cb.cc @@ -15,6 +15,7 @@ #include "gtest/gtest.h" #include "include/compat.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include #include @@ -49,7 +50,7 @@ TEST(LibCephFS, ReaddirRCB) { // check correctness if buffer is too small ASSERT_LE(0, ceph_closedir(cmount, dirp)); ASSERT_GE(0, ceph_opendir(cmount, c_dir, &dirp)); - ASSERT_EQ(-ERANGE, ceph_getdnames(cmount, dirp, buf, 1)); + ASSERT_EQ(-CEPHFS_ERANGE, ceph_getdnames(cmount, dirp, buf, 1)); //check correctness if it needs to split listing ASSERT_LE(0, ceph_closedir(cmount, dirp)); diff --git a/src/test/libcephfs/reclaim.cc b/src/test/libcephfs/reclaim.cc index 7b2f7b7694f..a8add1e46c4 100644 --- a/src/test/libcephfs/reclaim.cc +++ b/src/test/libcephfs/reclaim.cc @@ -8,6 +8,7 @@ #include "gtest/gtest.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include "include/stat.h" #include #include @@ -58,7 +59,7 @@ static int dying_client(int argc, char **argv) ceph_set_session_timeout(cmount, CEPHFS_RECLAIM_TIMEOUT); - if (ceph_start_reclaim(cmount, argv[1], CEPH_RECLAIM_RESET) != -ENOENT) + if (ceph_start_reclaim(cmount, argv[1], CEPH_RECLAIM_RESET) != -CEPHFS_ENOENT) return 1; ceph_set_uuid(cmount, argv[1]); diff --git a/src/test/libcephfs/recordlock.cc b/src/test/libcephfs/recordlock.cc index 3c0679d7db3..ad108b69cf6 100644 --- a/src/test/libcephfs/recordlock.cc +++ b/src/test/libcephfs/recordlock.cc @@ -21,6 +21,7 @@ #include "include/compat.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include #include #include @@ -117,7 +118,7 @@ TEST(LibCephFS, BasicRecordLocking) { lock2.l_start = 0; lock2.l_len = 1024; lock2.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock2, 43, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock2, 43, false)); // Now try a conflicting read lock lock2.l_type = F_RDLCK; @@ -125,7 +126,7 @@ TEST(LibCephFS, BasicRecordLocking) { lock2.l_start = 100; lock2.l_len = 100; lock2.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock2, 43, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock2, 43, false)); // Now do a getlk ASSERT_EQ(0, ceph_ll_getlk(cmount, fh, &lock2, 43)); @@ -312,7 +313,7 @@ static void thread_ConcurrentRecordLocking(str_ConcurrentRecordLocking& s) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); PING_MAIN(1); // (1) lock1.l_type = F_WRLCK; @@ -442,7 +443,7 @@ TEST(LibCephFS, ConcurrentRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; @@ -484,13 +485,13 @@ TEST(LibCephFS, ConcurrentRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); // Wake up thread to unlock exclusive lock PING_WORKER(3); // (R3) @@ -586,7 +587,7 @@ TEST(LibCephFS, ThreesomeRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; @@ -628,13 +629,13 @@ TEST(LibCephFS, ThreesomeRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); // Wake up thread to unlock exclusive lock PING_WORKER(3); // (R3) @@ -705,7 +706,7 @@ static void process_ConcurrentRecordLocking(str_ConcurrentRecordLocking& s) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); PING_MAIN(1); // (1) lock1.l_type = F_WRLCK; lock1.l_whence = SEEK_SET; @@ -847,7 +848,7 @@ TEST(LibCephFS, DISABLED_InterProcessRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; @@ -889,13 +890,13 @@ TEST(LibCephFS, DISABLED_InterProcessRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); // Wake up process to unlock exclusive lock PING_WORKER(4); // (R4) @@ -1018,7 +1019,7 @@ TEST(LibCephFS, DISABLED_ThreesomeInterProcessRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, mypid, false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; @@ -1060,13 +1061,13 @@ TEST(LibCephFS, DISABLED_ThreesomeInterProcessRecordLocking) { lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); lock1.l_type = F_RDLCK; lock1.l_whence = SEEK_SET; lock1.l_start = 0; lock1.l_len = 1024; lock1.l_pid = getpid(); - ASSERT_EQ(-EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); + ASSERT_EQ(-CEPHFS_EAGAIN, ceph_ll_setlk(cmount, fh, &lock1, ceph_pthread_self(), false)); // Wake up process to unlock exclusive lock PING_WORKER(4); // (R4) diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc index 058daba6c16..c119107b309 100644 --- a/src/test/libcephfs/test.cc +++ b/src/test/libcephfs/test.cc @@ -109,8 +109,8 @@ TEST(LibCephFS, OpenReadTruncate) { fd = ceph_open(cmount, path.c_str(), O_RDONLY, 0); ASSERT_LE(0, fd); - ASSERT_EQ(ceph_ftruncate(cmount, fd, 0), -EBADF); - ASSERT_EQ(ceph_ftruncate(cmount, fd, 1), -EBADF); + ASSERT_EQ(ceph_ftruncate(cmount, fd, 0), -CEPHFS_EBADF); + ASSERT_EQ(ceph_ftruncate(cmount, fd, 1), -CEPHFS_EBADF); ASSERT_EQ(0, ceph_close(cmount, fd)); ceph_shutdown(cmount); @@ -132,12 +132,12 @@ TEST(LibCephFS, OpenReadWrite) { size_t size = strlen(out_buf); char in_buf[100]; ASSERT_EQ(ceph_write(cmount, fd, out_buf, size, 0), (int)size); - ASSERT_EQ(ceph_read(cmount, fd, in_buf, sizeof(in_buf), 0), -EBADF); + ASSERT_EQ(ceph_read(cmount, fd, in_buf, sizeof(in_buf), 0), -CEPHFS_EBADF); ASSERT_EQ(0, ceph_close(cmount, fd)); fd = ceph_open(cmount, c_path, O_RDONLY, 0); ASSERT_LT(0, fd); - ASSERT_EQ(ceph_write(cmount, fd, out_buf, size, 0), -EBADF); + ASSERT_EQ(ceph_write(cmount, fd, out_buf, size, 0), -CEPHFS_EBADF); ASSERT_EQ(ceph_read(cmount, fd, in_buf, sizeof(in_buf), 0), (int)size); ASSERT_EQ(0, ceph_close(cmount, fd)); @@ -169,7 +169,7 @@ TEST(LibCephFS, MountDouble) { ASSERT_EQ(0, ceph_conf_read_file(cmount, NULL)); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(0, ceph_mount(cmount, "/")); - ASSERT_EQ(-EISCONN, ceph_mount(cmount, "/")); + ASSERT_EQ(-CEPHFS_EISCONN, ceph_mount(cmount, "/")); ceph_shutdown(cmount); } @@ -198,7 +198,7 @@ TEST(LibCephFS, UnmountUnmounted) { ASSERT_EQ(0, ceph_create(&cmount, NULL)); ASSERT_EQ(0, ceph_conf_read_file(cmount, NULL)); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); - ASSERT_EQ(-ENOTCONN, ceph_unmount(cmount)); + ASSERT_EQ(-CEPHFS_ENOTCONN, ceph_unmount(cmount)); ceph_shutdown(cmount); } @@ -220,7 +220,7 @@ TEST(LibCephFS, ReleaseMounted) { ASSERT_EQ(0, ceph_conf_read_file(cmount, NULL)); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(0, ceph_mount(cmount, "/")); - ASSERT_EQ(-EISCONN, ceph_release(cmount)); + ASSERT_EQ(-CEPHFS_EISCONN, ceph_release(cmount)); ASSERT_EQ(0, ceph_unmount(cmount)); ASSERT_EQ(0, ceph_release(cmount)); } @@ -276,12 +276,12 @@ TEST(LibCephFS, OpenLayout) { char xattrv[128]; sprintf(xattrk, "ceph.file.layout.stripe_unit"); sprintf(xattrv, "65536"); - ASSERT_EQ(-ENOTEMPTY, ceph_setxattr(cmount, test_layout_file, xattrk, (void *)xattrv, 5, 0)); + ASSERT_EQ(-CEPHFS_ENOTEMPTY, ceph_setxattr(cmount, test_layout_file, xattrk, (void *)xattrv, 5, 0)); /* invalid layout */ sprintf(test_layout_file, "test_layout_%d_c", getpid()); fd = ceph_open_layout(cmount, test_layout_file, O_CREAT, 0666, (1<<20), 1, 19, NULL); - ASSERT_EQ(fd, -EINVAL); + ASSERT_EQ(fd, -CEPHFS_EINVAL); /* with data pool */ sprintf(test_layout_file, "test_layout_%d_d", getpid()); @@ -292,12 +292,12 @@ TEST(LibCephFS, OpenLayout) { /* with metadata pool (invalid) */ sprintf(test_layout_file, "test_layout_%d_e", getpid()); fd = ceph_open_layout(cmount, test_layout_file, O_CREAT, 0666, (1<<20), 7, (1<<20), "metadata"); - ASSERT_EQ(fd, -EINVAL); + ASSERT_EQ(fd, -CEPHFS_EINVAL); /* with metadata pool (does not exist) */ sprintf(test_layout_file, "test_layout_%d_f", getpid()); fd = ceph_open_layout(cmount, test_layout_file, O_CREAT, 0666, (1<<20), 7, (1<<20), "asdfjasdfjasdf"); - ASSERT_EQ(fd, -EINVAL); + ASSERT_EQ(fd, -CEPHFS_EINVAL); ceph_shutdown(cmount); } @@ -315,7 +315,7 @@ TEST(LibCephFS, DirLs) { struct ceph_dir_result *ls_dir = NULL; char foostr[256]; sprintf(foostr, "dir_ls%d", mypid); - ASSERT_EQ(ceph_opendir(cmount, foostr, &ls_dir), -ENOENT); + ASSERT_EQ(ceph_opendir(cmount, foostr, &ls_dir), -CEPHFS_ENOENT); ASSERT_EQ(ceph_mkdir(cmount, foostr, 0777), 0); struct ceph_statx stx; @@ -324,7 +324,7 @@ TEST(LibCephFS, DirLs) { char barstr[256]; sprintf(barstr, "dir_ls2%d", mypid); - ASSERT_EQ(ceph_statx(cmount, barstr, &stx, 0, AT_SYMLINK_NOFOLLOW), -ENOENT); + ASSERT_EQ(ceph_statx(cmount, barstr, &stx, 0, AT_SYMLINK_NOFOLLOW), -CEPHFS_ENOENT); // insert files into directory and test open char bazstr[256]; @@ -563,7 +563,7 @@ TEST(LibCephFS, Xattrs) { ASSERT_GT(fd, 0); // test removing non-existent xattr - ASSERT_EQ(-ENODATA, ceph_removexattr(cmount, test_xattr_file, "user.nosuchxattr")); + ASSERT_EQ(-CEPHFS_ENODATA, ceph_removexattr(cmount, test_xattr_file, "user.nosuchxattr")); char i = 'a'; char xattrk[128]; @@ -582,7 +582,7 @@ TEST(LibCephFS, Xattrs) { char xattrlist[128*26]; ASSERT_GT(sizeof(xattrlist), (size_t)len_needed); int len = ceph_listxattr(cmount, test_xattr_file, xattrlist, len_needed - 1); - ASSERT_EQ(-ERANGE, len); + ASSERT_EQ(-CEPHFS_ERANGE, len); len = ceph_listxattr(cmount, test_xattr_file, xattrlist, sizeof(xattrlist)); ASSERT_EQ(len, len_needed); @@ -763,7 +763,7 @@ TEST(LibCephFS, DoubleChmod) { ASSERT_EQ(ceph_chmod(cmount, test_file, 0400), 0); fd = ceph_open(cmount, test_file, O_RDWR, 0); - ASSERT_EQ(fd, -EACCES); + ASSERT_EQ(fd, -CEPHFS_EACCES); fd = ceph_open(cmount, test_file, O_RDONLY, 0); ASSERT_GT(fd, -1); @@ -774,7 +774,7 @@ TEST(LibCephFS, DoubleChmod) { buf[ret] = '\0'; ASSERT_STREQ(buf, bytes); - ASSERT_EQ(ceph_write(cmount, fd, bytes, strlen(bytes), 0), -EBADF); + ASSERT_EQ(ceph_write(cmount, fd, bytes, strlen(bytes), 0), -CEPHFS_EBADF); ceph_close(cmount, fd); @@ -825,7 +825,7 @@ TEST(LibCephFS, Fchmod) { ceph_close(cmount, fd); - ASSERT_EQ(ceph_open(cmount, test_file, O_RDWR, 0), -EACCES); + ASSERT_EQ(ceph_open(cmount, test_file, O_RDWR, 0), -CEPHFS_EACCES); // reset back to writeable ASSERT_EQ(ceph_chmod(cmount, test_file, 0600), 0); @@ -906,7 +906,7 @@ TEST(LibCephFS, Fchown) { // "nobody" will be ignored on Windows #ifndef _WIN32 fd = ceph_open(cmount, test_file, O_RDWR, 0); - ASSERT_EQ(fd, -EACCES); + ASSERT_EQ(fd, -CEPHFS_EACCES); #endif ceph_shutdown(cmount); @@ -925,7 +925,7 @@ TEST(LibCephFS, FlagO_PATH) { sprintf(test_file, "test_oflag_%d", getpid()); int fd = ceph_open(cmount, test_file, O_CREAT|O_RDWR|O_PATH, 0666); - ASSERT_EQ(-ENOENT, fd); + ASSERT_EQ(-CEPHFS_ENOENT, fd); fd = ceph_open(cmount, test_file, O_CREAT|O_RDWR, 0666); ASSERT_GT(fd, 0); @@ -936,17 +936,17 @@ TEST(LibCephFS, FlagO_PATH) { ASSERT_GT(fd, 0); char buf[128]; - ASSERT_EQ(-EBADF, ceph_read(cmount, fd, buf, sizeof(buf), 0)); - ASSERT_EQ(-EBADF, ceph_write(cmount, fd, buf, sizeof(buf), 0)); + ASSERT_EQ(-CEPHFS_EBADF, ceph_read(cmount, fd, buf, sizeof(buf), 0)); + ASSERT_EQ(-CEPHFS_EBADF, ceph_write(cmount, fd, buf, sizeof(buf), 0)); // set perms to readable and writeable only by owner - ASSERT_EQ(-EBADF, ceph_fchmod(cmount, fd, 0600)); + ASSERT_EQ(-CEPHFS_EBADF, ceph_fchmod(cmount, fd, 0600)); // change ownership to nobody -- we assume nobody exists and id is always 65534 - ASSERT_EQ(-EBADF, ceph_fchown(cmount, fd, 65534, 65534)); + ASSERT_EQ(-CEPHFS_EBADF, ceph_fchown(cmount, fd, 65534, 65534)); // try to sync - ASSERT_EQ(-EBADF, ceph_fsync(cmount, fd, false)); + ASSERT_EQ(-CEPHFS_EBADF, ceph_fsync(cmount, fd, false)); struct ceph_statx stx; ASSERT_EQ(0, ceph_fstatx(cmount, fd, &stx, 0, 0)); @@ -978,7 +978,7 @@ TEST(LibCephFS, Symlinks) { // test the O_NOFOLLOW case fd = ceph_open(cmount, test_symlink, O_NOFOLLOW, 0); - ASSERT_EQ(fd, -ELOOP); + ASSERT_EQ(fd, -CEPHFS_ELOOP); // stat the original file struct ceph_statx stx_orig; @@ -1072,7 +1072,7 @@ TEST(LibCephFS, LoopSyms) { char test_file[256]; sprintf(test_file, "/dir1_loopsym_%d/loop_dir/symdir/test_loopsym_file", getpid()); int fd = ceph_open(cmount, test_file, O_CREAT|O_RDWR, 0600); - ASSERT_EQ(fd, -ELOOP); + ASSERT_EQ(fd, -CEPHFS_ELOOP); // loop: /a -> /b, /b -> /c, /c -> /a char a[264], b[264], c[264]; @@ -1082,7 +1082,7 @@ TEST(LibCephFS, LoopSyms) { ASSERT_EQ(ceph_symlink(cmount, a, b), 0); ASSERT_EQ(ceph_symlink(cmount, b, c), 0); ASSERT_EQ(ceph_symlink(cmount, c, a), 0); - ASSERT_EQ(ceph_open(cmount, a, O_RDWR, 0), -ELOOP); + ASSERT_EQ(ceph_open(cmount, a, O_RDWR, 0), -CEPHFS_ELOOP); ceph_shutdown(cmount); } @@ -1153,32 +1153,32 @@ TEST(LibCephFS, BadFileDesc) { ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(ceph_mount(cmount, NULL), 0); - ASSERT_EQ(ceph_fchmod(cmount, -1, 0655), -EBADF); - ASSERT_EQ(ceph_close(cmount, -1), -EBADF); - ASSERT_EQ(ceph_lseek(cmount, -1, 0, SEEK_SET), -EBADF); + ASSERT_EQ(ceph_fchmod(cmount, -1, 0655), -CEPHFS_EBADF); + ASSERT_EQ(ceph_close(cmount, -1), -CEPHFS_EBADF); + ASSERT_EQ(ceph_lseek(cmount, -1, 0, SEEK_SET), -CEPHFS_EBADF); char buf[0]; - ASSERT_EQ(ceph_read(cmount, -1, buf, 0, 0), -EBADF); - ASSERT_EQ(ceph_write(cmount, -1, buf, 0, 0), -EBADF); + ASSERT_EQ(ceph_read(cmount, -1, buf, 0, 0), -CEPHFS_EBADF); + ASSERT_EQ(ceph_write(cmount, -1, buf, 0, 0), -CEPHFS_EBADF); - ASSERT_EQ(ceph_ftruncate(cmount, -1, 0), -EBADF); - ASSERT_EQ(ceph_fsync(cmount, -1, 0), -EBADF); + ASSERT_EQ(ceph_ftruncate(cmount, -1, 0), -CEPHFS_EBADF); + ASSERT_EQ(ceph_fsync(cmount, -1, 0), -CEPHFS_EBADF); struct ceph_statx stx; - ASSERT_EQ(ceph_fstatx(cmount, -1, &stx, 0, 0), -EBADF); + ASSERT_EQ(ceph_fstatx(cmount, -1, &stx, 0, 0), -CEPHFS_EBADF); struct sockaddr_storage addr; - ASSERT_EQ(ceph_get_file_stripe_address(cmount, -1, 0, &addr, 1), -EBADF); + ASSERT_EQ(ceph_get_file_stripe_address(cmount, -1, 0, &addr, 1), -CEPHFS_EBADF); - ASSERT_EQ(ceph_get_file_stripe_unit(cmount, -1), -EBADF); - ASSERT_EQ(ceph_get_file_pool(cmount, -1), -EBADF); + ASSERT_EQ(ceph_get_file_stripe_unit(cmount, -1), -CEPHFS_EBADF); + ASSERT_EQ(ceph_get_file_pool(cmount, -1), -CEPHFS_EBADF); char poolname[80]; - ASSERT_EQ(ceph_get_file_pool_name(cmount, -1, poolname, sizeof(poolname)), -EBADF); - ASSERT_EQ(ceph_get_file_replication(cmount, -1), -EBADF); - ASSERT_EQ(ceph_get_file_object_size(cmount, -1), -EBADF); + ASSERT_EQ(ceph_get_file_pool_name(cmount, -1, poolname, sizeof(poolname)), -CEPHFS_EBADF); + ASSERT_EQ(ceph_get_file_replication(cmount, -1), -CEPHFS_EBADF); + ASSERT_EQ(ceph_get_file_object_size(cmount, -1), -CEPHFS_EBADF); int stripe_unit, stripe_count, object_size, pg_pool; - ASSERT_EQ(ceph_get_file_layout(cmount, -1, &stripe_unit, &stripe_count, &object_size, &pg_pool), -EBADF); - ASSERT_EQ(ceph_get_file_stripe_count(cmount, -1), -EBADF); + ASSERT_EQ(ceph_get_file_layout(cmount, -1, &stripe_unit, &stripe_count, &object_size, &pg_pool), -CEPHFS_EBADF); + ASSERT_EQ(ceph_get_file_stripe_count(cmount, -1), -CEPHFS_EBADF); ceph_shutdown(cmount); } @@ -1333,10 +1333,10 @@ TEST(LibCephFS, Rename) { ASSERT_EQ(0, ceph_statx(cmount, path_dst, &stx, 0, 0)); /* test that src path doesn't exist */ - ASSERT_EQ(-ENOENT, ceph_statx(cmount, path_src, &stx, 0, AT_SYMLINK_NOFOLLOW)); + ASSERT_EQ(-CEPHFS_ENOENT, ceph_statx(cmount, path_src, &stx, 0, AT_SYMLINK_NOFOLLOW)); /* rename with non-existent source path */ - ASSERT_EQ(-ENOENT, ceph_rename(cmount, path_src, path_dst)); + ASSERT_EQ(-CEPHFS_ENOENT, ceph_rename(cmount, path_src, path_dst)); ASSERT_EQ(0, ceph_unlink(cmount, path_dst)); ceph_shutdown(cmount); @@ -1349,86 +1349,86 @@ TEST(LibCephFS, UseUnmounted) { ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); struct statvfs stvfs; - EXPECT_EQ(-ENOTCONN, ceph_statfs(cmount, "/", &stvfs)); - EXPECT_EQ(-ENOTCONN, ceph_get_local_osd(cmount)); - EXPECT_EQ(-ENOTCONN, ceph_chdir(cmount, "/")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_statfs(cmount, "/", &stvfs)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_local_osd(cmount)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_chdir(cmount, "/")); struct ceph_dir_result *dirp; - EXPECT_EQ(-ENOTCONN, ceph_opendir(cmount, "/", &dirp)); - EXPECT_EQ(-ENOTCONN, ceph_closedir(cmount, dirp)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_opendir(cmount, "/", &dirp)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_closedir(cmount, dirp)); ceph_readdir(cmount, dirp); EXPECT_EQ(ENOTCONN, errno); struct dirent rdent; - EXPECT_EQ(-ENOTCONN, ceph_readdir_r(cmount, dirp, &rdent)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_readdir_r(cmount, dirp, &rdent)); struct ceph_statx stx; - EXPECT_EQ(-ENOTCONN, ceph_readdirplus_r(cmount, dirp, &rdent, &stx, 0, 0, NULL)); - EXPECT_EQ(-ENOTCONN, ceph_getdents(cmount, dirp, NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_getdnames(cmount, dirp, NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_telldir(cmount, dirp)); - EXPECT_EQ(-ENOTCONN, ceph_link(cmount, "/", "/link")); - EXPECT_EQ(-ENOTCONN, ceph_unlink(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_rename(cmount, "/path", "/path")); - EXPECT_EQ(-ENOTCONN, ceph_mkdir(cmount, "/", 0655)); - EXPECT_EQ(-ENOTCONN, ceph_mkdirs(cmount, "/", 0655)); - EXPECT_EQ(-ENOTCONN, ceph_rmdir(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_readlink(cmount, "/path", NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_symlink(cmount, "/path", "/path")); - EXPECT_EQ(-ENOTCONN, ceph_statx(cmount, "/path", &stx, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_setattrx(cmount, "/path", &stx, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_getxattr(cmount, "/path", "name", NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_lgetxattr(cmount, "/path", "name", NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_listxattr(cmount, "/path", NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_llistxattr(cmount, "/path", NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_removexattr(cmount, "/path", "name")); - EXPECT_EQ(-ENOTCONN, ceph_lremovexattr(cmount, "/path", "name")); - EXPECT_EQ(-ENOTCONN, ceph_setxattr(cmount, "/path", "name", NULL, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_lsetxattr(cmount, "/path", "name", NULL, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_fsetattrx(cmount, 0, &stx, 0)); - EXPECT_EQ(-ENOTCONN, ceph_chmod(cmount, "/path", 0)); - EXPECT_EQ(-ENOTCONN, ceph_fchmod(cmount, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_chown(cmount, "/path", 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_lchown(cmount, "/path", 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_fchown(cmount, 0, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_readdirplus_r(cmount, dirp, &rdent, &stx, 0, 0, NULL)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_getdents(cmount, dirp, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_getdnames(cmount, dirp, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_telldir(cmount, dirp)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_link(cmount, "/", "/link")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_unlink(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_rename(cmount, "/path", "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_mkdir(cmount, "/", 0655)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_mkdirs(cmount, "/", 0655)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_rmdir(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_readlink(cmount, "/path", NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_symlink(cmount, "/path", "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_statx(cmount, "/path", &stx, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_setattrx(cmount, "/path", &stx, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_getxattr(cmount, "/path", "name", NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_lgetxattr(cmount, "/path", "name", NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_listxattr(cmount, "/path", NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_llistxattr(cmount, "/path", NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_removexattr(cmount, "/path", "name")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_lremovexattr(cmount, "/path", "name")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_setxattr(cmount, "/path", "name", NULL, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_lsetxattr(cmount, "/path", "name", NULL, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_fsetattrx(cmount, 0, &stx, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_chmod(cmount, "/path", 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_fchmod(cmount, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_chown(cmount, "/path", 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_lchown(cmount, "/path", 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_fchown(cmount, 0, 0, 0)); struct utimbuf utb; - EXPECT_EQ(-ENOTCONN, ceph_utime(cmount, "/path", &utb)); - EXPECT_EQ(-ENOTCONN, ceph_truncate(cmount, "/path", 0)); - EXPECT_EQ(-ENOTCONN, ceph_mknod(cmount, "/path", 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_open(cmount, "/path", 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_open_layout(cmount, "/path", 0, 0, 0, 0, 0, "pool")); - EXPECT_EQ(-ENOTCONN, ceph_close(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_lseek(cmount, 0, 0, SEEK_SET)); - EXPECT_EQ(-ENOTCONN, ceph_read(cmount, 0, NULL, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_write(cmount, 0, NULL, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_ftruncate(cmount, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_fsync(cmount, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_fstatx(cmount, 0, &stx, 0, 0)); - EXPECT_EQ(-ENOTCONN, ceph_sync_fs(cmount)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_stripe_unit(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_stripe_count(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_layout(cmount, 0, NULL, NULL ,NULL ,NULL)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_object_size(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_pool(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_pool_name(cmount, 0, NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_replication(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_path_replication(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_get_path_layout(cmount, "/path", NULL, NULL, NULL, NULL)); - EXPECT_EQ(-ENOTCONN, ceph_get_path_object_size(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_get_path_stripe_count(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_get_path_stripe_unit(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_get_path_pool(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_get_path_pool_name(cmount, "/path", NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_pool_name(cmount, 0, NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_get_file_stripe_address(cmount, 0, 0, NULL, 0)); - EXPECT_EQ(-ENOTCONN, ceph_localize_reads(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_debug_get_fd_caps(cmount, 0)); - EXPECT_EQ(-ENOTCONN, ceph_debug_get_file_caps(cmount, "/path")); - EXPECT_EQ(-ENOTCONN, ceph_get_stripe_unit_granularity(cmount)); - EXPECT_EQ(-ENOTCONN, ceph_get_pool_id(cmount, "data")); - EXPECT_EQ(-ENOTCONN, ceph_get_pool_replication(cmount, 1)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_utime(cmount, "/path", &utb)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_truncate(cmount, "/path", 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_mknod(cmount, "/path", 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_open(cmount, "/path", 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_open_layout(cmount, "/path", 0, 0, 0, 0, 0, "pool")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_close(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_lseek(cmount, 0, 0, SEEK_SET)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_read(cmount, 0, NULL, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_write(cmount, 0, NULL, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_ftruncate(cmount, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_fsync(cmount, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_fstatx(cmount, 0, &stx, 0, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_sync_fs(cmount)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_stripe_unit(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_stripe_count(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_layout(cmount, 0, NULL, NULL ,NULL ,NULL)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_object_size(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_pool(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_pool_name(cmount, 0, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_replication(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_replication(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_layout(cmount, "/path", NULL, NULL, NULL, NULL)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_object_size(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_stripe_count(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_stripe_unit(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_pool(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_path_pool_name(cmount, "/path", NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_pool_name(cmount, 0, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_stripe_address(cmount, 0, 0, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_localize_reads(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_debug_get_fd_caps(cmount, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_debug_get_file_caps(cmount, "/path")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_stripe_unit_granularity(cmount)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_pool_id(cmount, "data")); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_pool_replication(cmount, 1)); ceph_release(cmount); } @@ -1444,7 +1444,7 @@ TEST(LibCephFS, GetPoolId) { memset(name, 0, sizeof(name)); ASSERT_LE(0, ceph_get_path_pool_name(cmount, "/", name, sizeof(name))); ASSERT_GE(ceph_get_pool_id(cmount, name), 0); - ASSERT_EQ(ceph_get_pool_id(cmount, "weflkjwelfjwlkejf"), -ENOENT); + ASSERT_EQ(ceph_get_pool_id(cmount, "weflkjwelfjwlkejf"), -CEPHFS_ENOENT); ceph_shutdown(cmount); } @@ -1457,7 +1457,7 @@ TEST(LibCephFS, GetPoolReplication) { ASSERT_EQ(ceph_mount(cmount, NULL), 0); /* negative pools */ - ASSERT_EQ(ceph_get_pool_replication(cmount, -10), -ENOENT); + ASSERT_EQ(ceph_get_pool_replication(cmount, -10), -CEPHFS_ENOENT); /* valid pool */ int pool_id; @@ -1474,7 +1474,7 @@ TEST(LibCephFS, GetExtentOsds) { struct ceph_mount_info *cmount; ASSERT_EQ(ceph_create(&cmount, NULL), 0); - EXPECT_EQ(-ENOTCONN, ceph_get_file_extent_osds(cmount, 0, 0, NULL, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_file_extent_osds(cmount, 0, 0, NULL, NULL, 0)); ASSERT_EQ(ceph_conf_read_file(cmount, NULL), 0); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); @@ -1514,7 +1514,7 @@ TEST(LibCephFS, GetExtentOsds) { /* only when more than 1 osd */ if (ret > 1) { - EXPECT_EQ(-ERANGE, ceph_get_file_extent_osds(cmount, fd, 0, NULL, osds, 1)); + EXPECT_EQ(-CEPHFS_ERANGE, ceph_get_file_extent_osds(cmount, fd, 0, NULL, osds, 1)); } ceph_close(cmount, fd); @@ -1526,17 +1526,17 @@ TEST(LibCephFS, GetOsdCrushLocation) { struct ceph_mount_info *cmount; ASSERT_EQ(ceph_create(&cmount, NULL), 0); - EXPECT_EQ(-ENOTCONN, ceph_get_osd_crush_location(cmount, 0, NULL, 0)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_osd_crush_location(cmount, 0, NULL, 0)); ASSERT_EQ(ceph_conf_read_file(cmount, NULL), 0); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(ceph_mount(cmount, NULL), 0); - ASSERT_EQ(ceph_get_osd_crush_location(cmount, 0, NULL, 1), -EINVAL); + ASSERT_EQ(ceph_get_osd_crush_location(cmount, 0, NULL, 1), -CEPHFS_EINVAL); char path[256]; - ASSERT_EQ(ceph_get_osd_crush_location(cmount, 9999999, path, 0), -ENOENT); - ASSERT_EQ(ceph_get_osd_crush_location(cmount, -1, path, 0), -EINVAL); + ASSERT_EQ(ceph_get_osd_crush_location(cmount, 9999999, path, 0), -CEPHFS_ENOENT); + ASSERT_EQ(ceph_get_osd_crush_location(cmount, -1, path, 0), -CEPHFS_EINVAL); char test_file[256]; sprintf(test_file, "test_osds_loc_%d", getpid()); @@ -1552,7 +1552,7 @@ TEST(LibCephFS, GetOsdCrushLocation) { EXPECT_EQ(ret, ceph_get_file_extent_osds(cmount, fd, 0, NULL, osds, ret)); ASSERT_GT(ceph_get_osd_crush_location(cmount, 0, path, 0), 0); - ASSERT_EQ(ceph_get_osd_crush_location(cmount, 0, path, 1), -ERANGE); + ASSERT_EQ(ceph_get_osd_crush_location(cmount, 0, path, 1), -CEPHFS_ERANGE); for (int i = 0; i < ret; i++) { int len = ceph_get_osd_crush_location(cmount, osds[i], path, sizeof(path)); @@ -1577,17 +1577,17 @@ TEST(LibCephFS, GetOsdAddr) { struct ceph_mount_info *cmount; ASSERT_EQ(ceph_create(&cmount, NULL), 0); - EXPECT_EQ(-ENOTCONN, ceph_get_osd_addr(cmount, 0, NULL)); + EXPECT_EQ(-CEPHFS_ENOTCONN, ceph_get_osd_addr(cmount, 0, NULL)); ASSERT_EQ(ceph_conf_read_file(cmount, NULL), 0); ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(ceph_mount(cmount, NULL), 0); - ASSERT_EQ(-EINVAL, ceph_get_osd_addr(cmount, 0, NULL)); + ASSERT_EQ(-CEPHFS_EINVAL, ceph_get_osd_addr(cmount, 0, NULL)); struct sockaddr_storage addr; - ASSERT_EQ(-ENOENT, ceph_get_osd_addr(cmount, -1, &addr)); - ASSERT_EQ(-ENOENT, ceph_get_osd_addr(cmount, 9999999, &addr)); + ASSERT_EQ(-CEPHFS_ENOENT, ceph_get_osd_addr(cmount, -1, &addr)); + ASSERT_EQ(-CEPHFS_ENOENT, ceph_get_osd_addr(cmount, 9999999, &addr)); ASSERT_EQ(0, ceph_get_osd_addr(cmount, 0, &addr)); @@ -2153,27 +2153,27 @@ TEST(LibCephFS, OperationsOnRoot) ASSERT_EQ(ceph_mkdir(cmount, dirname, 0755), 0); - ASSERT_EQ(ceph_rmdir(cmount, "/"), -EBUSY); + ASSERT_EQ(ceph_rmdir(cmount, "/"), -CEPHFS_EBUSY); - ASSERT_EQ(ceph_link(cmount, "/", "/"), -EEXIST); - ASSERT_EQ(ceph_link(cmount, dirname, "/"), -EEXIST); - ASSERT_EQ(ceph_link(cmount, "nonExisitingDir", "/"), -ENOENT); + ASSERT_EQ(ceph_link(cmount, "/", "/"), -CEPHFS_EEXIST); + ASSERT_EQ(ceph_link(cmount, dirname, "/"), -CEPHFS_EEXIST); + ASSERT_EQ(ceph_link(cmount, "nonExisitingDir", "/"), -CEPHFS_ENOENT); - ASSERT_EQ(ceph_unlink(cmount, "/"), -EISDIR); + ASSERT_EQ(ceph_unlink(cmount, "/"), -CEPHFS_EISDIR); - ASSERT_EQ(ceph_rename(cmount, "/", "/"), -EBUSY); - ASSERT_EQ(ceph_rename(cmount, dirname, "/"), -EBUSY); - ASSERT_EQ(ceph_rename(cmount, "nonExistingDir", "/"), -EBUSY); - ASSERT_EQ(ceph_rename(cmount, "/", dirname), -EBUSY); - ASSERT_EQ(ceph_rename(cmount, "/", "nonExistingDir"), -EBUSY); + ASSERT_EQ(ceph_rename(cmount, "/", "/"), -CEPHFS_EBUSY); + ASSERT_EQ(ceph_rename(cmount, dirname, "/"), -CEPHFS_EBUSY); + ASSERT_EQ(ceph_rename(cmount, "nonExistingDir", "/"), -CEPHFS_EBUSY); + ASSERT_EQ(ceph_rename(cmount, "/", dirname), -CEPHFS_EBUSY); + ASSERT_EQ(ceph_rename(cmount, "/", "nonExistingDir"), -CEPHFS_EBUSY); - ASSERT_EQ(ceph_mkdir(cmount, "/", 0777), -EEXIST); + ASSERT_EQ(ceph_mkdir(cmount, "/", 0777), -CEPHFS_EEXIST); - ASSERT_EQ(ceph_mknod(cmount, "/", 0, 0), -EEXIST); + ASSERT_EQ(ceph_mknod(cmount, "/", 0, 0), -CEPHFS_EEXIST); - ASSERT_EQ(ceph_symlink(cmount, "/", "/"), -EEXIST); - ASSERT_EQ(ceph_symlink(cmount, dirname, "/"), -EEXIST); - ASSERT_EQ(ceph_symlink(cmount, "nonExistingDir", "/"), -EEXIST); + ASSERT_EQ(ceph_symlink(cmount, "/", "/"), -CEPHFS_EEXIST); + ASSERT_EQ(ceph_symlink(cmount, dirname, "/"), -CEPHFS_EEXIST); + ASSERT_EQ(ceph_symlink(cmount, "nonExistingDir", "/"), -CEPHFS_EEXIST); ceph_shutdown(cmount); } @@ -2386,19 +2386,19 @@ TEST(LibCephFS, OperationsOnDotDot) { sprintf(c_temp, "/oodd_temp_%d", mypid); ASSERT_EQ(0, ceph_mkdir(cmount, c_dir, 0777)); - ASSERT_EQ(-EEXIST, ceph_mkdir(cmount, c_dir_dot, 0777)); - ASSERT_EQ(-EEXIST, ceph_mkdir(cmount, c_dir_dotdot, 0777)); + ASSERT_EQ(-CEPHFS_EEXIST, ceph_mkdir(cmount, c_dir_dot, 0777)); + ASSERT_EQ(-CEPHFS_EEXIST, ceph_mkdir(cmount, c_dir_dotdot, 0777)); ASSERT_EQ(0, ceph_mkdirs(cmount, c_non_existent_dirs, 0777)); - ASSERT_EQ(-ENOTEMPTY, ceph_rmdir(cmount, c_dir_dot)); - ASSERT_EQ(-ENOTEMPTY, ceph_rmdir(cmount, c_dir_dotdot)); - // non existent directory should return -ENOENT - ASSERT_EQ(-ENOENT, ceph_rmdir(cmount, c_non_existent_dir)); + ASSERT_EQ(-CEPHFS_ENOTEMPTY, ceph_rmdir(cmount, c_dir_dot)); + ASSERT_EQ(-CEPHFS_ENOTEMPTY, ceph_rmdir(cmount, c_dir_dotdot)); + // non existent directory should return -CEPHFS_ENOENT + ASSERT_EQ(-CEPHFS_ENOENT, ceph_rmdir(cmount, c_non_existent_dir)); - ASSERT_EQ(-EBUSY, ceph_rename(cmount, c_dir_dot, c_temp)); + ASSERT_EQ(-CEPHFS_EBUSY, ceph_rename(cmount, c_dir_dot, c_temp)); ASSERT_EQ(0, ceph_chdir(cmount, c_dir)); ASSERT_EQ(0, ceph_mkdir(cmount, c_temp, 0777)); - ASSERT_EQ(-EBUSY, ceph_rename(cmount, c_temp, "..")); + ASSERT_EQ(-CEPHFS_EBUSY, ceph_rename(cmount, c_temp, "..")); ceph_shutdown(cmount); } @@ -2473,7 +2473,7 @@ TEST(LibCephFS, SnapXattrs) { // non-snap file shouldn't carry the xattr alen = ceph_getxattr(cmount, test_snap_xattr_file, "ceph.snap.btime", (void *)gxattrv2, xbuflen); - ASSERT_EQ(-ENODATA, alen); + ASSERT_EQ(-CEPHFS_ENODATA, alen); // create a second snapshot sprintf(c_temp, "/.snap/test_snap_xattr_snap2_%d", mypid); @@ -2536,13 +2536,13 @@ TEST(LibCephFS, Lseek) { /* Test basic functionality and out of bounds conditions for SEEK_HOLE/DATA */ #ifdef SEEK_HOLE ASSERT_EQ(size, ceph_lseek(cmount, fd, 0, SEEK_HOLE)); - ASSERT_EQ(-ENXIO, ceph_lseek(cmount, fd, -1, SEEK_HOLE)); - ASSERT_EQ(-ENXIO, ceph_lseek(cmount, fd, size + 1, SEEK_HOLE)); + ASSERT_EQ(-CEPHFS_ENXIO, ceph_lseek(cmount, fd, -1, SEEK_HOLE)); + ASSERT_EQ(-CEPHFS_ENXIO, ceph_lseek(cmount, fd, size + 1, SEEK_HOLE)); #endif #ifdef SEEK_DATA ASSERT_EQ(0, ceph_lseek(cmount, fd, 0, SEEK_DATA)); - ASSERT_EQ(-ENXIO, ceph_lseek(cmount, fd, -1, SEEK_DATA)); - ASSERT_EQ(-ENXIO, ceph_lseek(cmount, fd, size + 1, SEEK_DATA)); + ASSERT_EQ(-CEPHFS_ENXIO, ceph_lseek(cmount, fd, -1, SEEK_DATA)); + ASSERT_EQ(-CEPHFS_ENXIO, ceph_lseek(cmount, fd, size + 1, SEEK_DATA)); #endif ASSERT_EQ(0, ceph_close(cmount, fd)); @@ -2557,7 +2557,7 @@ TEST(LibCephFS, SnapInfoOnNonSnapshot) { ASSERT_EQ(ceph_mount(cmount, NULL), 0); struct snap_info info; - ASSERT_EQ(-EINVAL, ceph_get_snap_info(cmount, "/", &info)); + ASSERT_EQ(-CEPHFS_EINVAL, ceph_get_snap_info(cmount, "/", &info)); ceph_shutdown(cmount); } @@ -2642,9 +2642,9 @@ TEST(LibCephFS, LookupInoMDSDir) { Inode *inode; auto ino = inodeno_t(0x100); /* rank 0 ~mdsdir */ - ASSERT_EQ(-ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); + ASSERT_EQ(-CEPHFS_ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); ino = inodeno_t(0x600); /* rank 0 first stray dir */ - ASSERT_EQ(-ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); + ASSERT_EQ(-CEPHFS_ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); ceph_shutdown(cmount); } @@ -2815,7 +2815,7 @@ TEST(LibCephFS, Statxat) { int fd1 = ceph_open(cmount, file_path, O_WRONLY|O_CREAT, 0666); ASSERT_LE(0, fd1); ASSERT_EQ(0, ceph_close(cmount, fd1)); - ASSERT_EQ(ceph_statxat(cmount, fd, rel_file_name_1, &stx, 0, 0), -ENOENT); + ASSERT_EQ(ceph_statxat(cmount, fd, rel_file_name_1, &stx, 0, 0), -CEPHFS_ENOENT); ASSERT_EQ(0, ceph_close(cmount, fd)); ASSERT_EQ(0, ceph_unlink(cmount, file_path)); @@ -3008,7 +3008,7 @@ TEST(LibCephFS, FdopendirOnNonDir) { ASSERT_LE(0, fd); struct ceph_dir_result *ls_dir = NULL; - ASSERT_EQ(ceph_fdopendir(cmount, fd, &ls_dir), -ENOTDIR); + ASSERT_EQ(ceph_fdopendir(cmount, fd, &ls_dir), -CEPHFS_ENOTDIR); ASSERT_EQ(0, ceph_close(cmount, fd)); ASSERT_EQ(0, ceph_unlink(cmount, bazstr)); @@ -3272,12 +3272,12 @@ TEST(LibCephFS, Unlinkat) { fd = ceph_open(cmount, dir_path, O_DIRECTORY | O_RDONLY, 0); ASSERT_LE(0, fd); - ASSERT_EQ(-ENOTDIR, ceph_unlinkat(cmount, fd, rel_file_path, AT_REMOVEDIR)); + ASSERT_EQ(-CEPHFS_ENOTDIR, ceph_unlinkat(cmount, fd, rel_file_path, AT_REMOVEDIR)); ASSERT_EQ(0, ceph_unlinkat(cmount, fd, rel_file_path, 0)); ASSERT_EQ(0, ceph_close(cmount, fd)); fd = ceph_open(cmount, "/", O_DIRECTORY | O_RDONLY, 0); - ASSERT_EQ(-EISDIR, ceph_unlinkat(cmount, fd, dir_name, 0)); + ASSERT_EQ(-CEPHFS_EISDIR, ceph_unlinkat(cmount, fd, dir_name, 0)); ASSERT_EQ(0, ceph_unlinkat(cmount, fd, dir_name, AT_REMOVEDIR)); ASSERT_LE(0, fd); @@ -3308,11 +3308,11 @@ TEST(LibCephFS, UnlinkatATFDCWD) { ASSERT_EQ(0, ceph_close(cmount, fd)); ASSERT_EQ(0, ceph_chdir(cmount, dir_path)); - ASSERT_EQ(-ENOTDIR, ceph_unlinkat(cmount, CEPHFS_AT_FDCWD, rel_file_path, AT_REMOVEDIR)); + ASSERT_EQ(-CEPHFS_ENOTDIR, ceph_unlinkat(cmount, CEPHFS_AT_FDCWD, rel_file_path, AT_REMOVEDIR)); ASSERT_EQ(0, ceph_unlinkat(cmount, CEPHFS_AT_FDCWD, rel_file_path, 0)); ASSERT_EQ(0, ceph_chdir(cmount, "/")); - ASSERT_EQ(-EISDIR, ceph_unlinkat(cmount, CEPHFS_AT_FDCWD, dir_name, 0)); + ASSERT_EQ(-CEPHFS_EISDIR, ceph_unlinkat(cmount, CEPHFS_AT_FDCWD, dir_name, 0)); ASSERT_EQ(0, ceph_unlinkat(cmount, CEPHFS_AT_FDCWD, dir_name, AT_REMOVEDIR)); ceph_shutdown(cmount); @@ -3353,7 +3353,7 @@ TEST(LibCephFS, Chownat) { // "nobody" will be ignored on Windows #ifndef _WIN32 fd = ceph_open(cmount, file_path, O_RDWR, 0); - ASSERT_EQ(fd, -EACCES); + ASSERT_EQ(fd, -CEPHFS_EACCES); #endif ASSERT_EQ(ceph_conf_set(cmount, "client_permissions", "0"), 0); @@ -3397,7 +3397,7 @@ TEST(LibCephFS, ChownatATFDCWD) { // "nobody" will be ignored on Windows #ifndef _WIN32 fd = ceph_open(cmount, file_path, O_RDWR, 0); - ASSERT_EQ(fd, -EACCES); + ASSERT_EQ(fd, -CEPHFS_EACCES); #endif ASSERT_EQ(ceph_conf_set(cmount, "client_permissions", "0"), 0); @@ -3435,7 +3435,7 @@ TEST(LibCephFS, Chmodat) { // set perms to read but can't write ASSERT_EQ(ceph_chmodat(cmount, fd, rel_file_path, 0400, 0), 0); - ASSERT_EQ(ceph_open(cmount, file_path, O_RDWR, 0), -EACCES); + ASSERT_EQ(ceph_open(cmount, file_path, O_RDWR, 0), -CEPHFS_EACCES); // reset back to writeable ASSERT_EQ(ceph_chmodat(cmount, fd, rel_file_path, 0600, 0), 0); @@ -3477,7 +3477,7 @@ TEST(LibCephFS, ChmodatATFDCWD) { // set perms to read but can't write ASSERT_EQ(0, ceph_chdir(cmount, dir_path)); ASSERT_EQ(ceph_chmodat(cmount, CEPHFS_AT_FDCWD, rel_file_path, 0400, 0), 0); - ASSERT_EQ(ceph_open(cmount, file_path, O_RDWR, 0), -EACCES); + ASSERT_EQ(ceph_open(cmount, file_path, O_RDWR, 0), -CEPHFS_EACCES); // reset back to writeable ASSERT_EQ(ceph_chmodat(cmount, CEPHFS_AT_FDCWD, rel_file_path, 0600, 0), 0); @@ -3578,22 +3578,22 @@ TEST(LibCephFS, LookupMdsPrivateInos) { Inode *inode; for (int ino = 0; ino < MDS_INO_SYSTEM_BASE; ino++) { if (MDS_IS_PRIVATE_INO(ino)) { - ASSERT_EQ(-ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); + ASSERT_EQ(-CEPHFS_ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); } else if (ino == CEPH_INO_ROOT || ino == CEPH_INO_GLOBAL_SNAPREALM) { ASSERT_EQ(0, ceph_ll_lookup_inode(cmount, ino, &inode)); ceph_ll_put(cmount, inode); } else if (ino == CEPH_INO_LOST_AND_FOUND) { // the ino 3 will only exists after the recovery tool ran, so - // it may return -ESTALE with a fresh fs cluster + // it may return -CEPHFS_ESTALE with a fresh fs cluster int r = ceph_ll_lookup_inode(cmount, ino, &inode); if (r == 0) { ceph_ll_put(cmount, inode); } else { - ASSERT_TRUE(r == -ESTALE); + ASSERT_TRUE(r == -CEPHFS_ESTALE); } } else { // currently the ino 0 and 4~99 is not useded yet. - ASSERT_EQ(-ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); + ASSERT_EQ(-CEPHFS_ESTALE, ceph_ll_lookup_inode(cmount, ino, &inode)); } } @@ -3607,7 +3607,7 @@ TEST(LibCephFS, SetMountTimeoutPostMount) { ASSERT_EQ(0, ceph_conf_parse_env(cmount, NULL)); ASSERT_EQ(ceph_mount(cmount, NULL), 0); - ASSERT_EQ(-EINVAL, ceph_set_mount_timeout(cmount, 5)); + ASSERT_EQ(-CEPHFS_EINVAL, ceph_set_mount_timeout(cmount, 5)); ceph_shutdown(cmount); } diff --git a/src/test/libcephfs/vxattr.cc b/src/test/libcephfs/vxattr.cc index 9af85a0c40e..2d06ae180d9 100644 --- a/src/test/libcephfs/vxattr.cc +++ b/src/test/libcephfs/vxattr.cc @@ -15,6 +15,7 @@ #include "include/compat.h" #include "gtest/gtest.h" #include "include/cephfs/libcephfs.h" +#include "include/fs_types.h" #include "mds/mdstypes.h" #include "include/stat.h" #include @@ -200,7 +201,7 @@ TEST(LibCephFS, LayoutSetBadJSON) { "\"pool_name\": \"cephfs.a.data\", " "}"; // try to set a malformed JSON, eg. without an open brace - ASSERT_EQ(-EINVAL, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.json", (void*)new_layout, strlen(new_layout), XATTR_CREATE)); + ASSERT_EQ(-CEPHFS_EINVAL, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.json", (void*)new_layout, strlen(new_layout), XATTR_CREATE)); } ASSERT_EQ(0, ceph_rmdir(cmount, "test/d0/subdir")); @@ -222,7 +223,7 @@ TEST(LibCephFS, LayoutSetBadPoolName) { { // try setting a bad pool name - ASSERT_EQ(-EINVAL, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.pool_name", (void*)"UglyPoolName", 12, XATTR_CREATE)); + ASSERT_EQ(-CEPHFS_EINVAL, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.pool_name", (void*)"UglyPoolName", 12, XATTR_CREATE)); } ASSERT_EQ(0, ceph_rmdir(cmount, "test/d0/subdir")); @@ -244,7 +245,7 @@ TEST(LibCephFS, LayoutSetBadPoolId) { { // try setting a bad pool id - ASSERT_EQ(-EINVAL, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.pool_id", (void*)"300", 3, XATTR_CREATE)); + ASSERT_EQ(-CEPHFS_EINVAL, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.pool_id", (void*)"300", 3, XATTR_CREATE)); } ASSERT_EQ(0, ceph_rmdir(cmount, "test/d0/subdir")); @@ -266,7 +267,7 @@ TEST(LibCephFS, LayoutSetInvalidFieldName) { { // try to set in invalid field - ASSERT_EQ(-ENODATA, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.bad_field", (void*)"300", 3, XATTR_CREATE)); + ASSERT_EQ(-CEPHFS_ENODATA, ceph_setxattr(cmount, "test/d0", "ceph.dir.layout.bad_field", (void*)"300", 3, XATTR_CREATE)); } ASSERT_EQ(0, ceph_rmdir(cmount, "test/d0/subdir")); -- 2.39.5