From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 12 Oct 2016 11:04:42 +0000 (-0400)
Subject: client: convert some ceph_fstat callers to ceph_fstatx
X-Git-Tag: v11.1.0~625^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7d78e41b6bb1d8832e9b0d61f21beeb8d1c421a5;p=ceph-ci.git

client: convert some ceph_fstat callers to ceph_fstatx

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/test/libcephfs/acl.cc b/src/test/libcephfs/acl.cc
index 3ed57bf3e28..004c053e830 100644
--- a/src/test/libcephfs/acl.cc
+++ b/src/test/libcephfs/acl.cc
@@ -160,11 +160,11 @@ TEST(ACL, SetACL) {
   ASSERT_GT(tmpfd, 0);
   ceph_close(cmount, tmpfd);
 
-  struct stat stbuf;
-  ASSERT_EQ(ceph_fstat(cmount, fd, &stbuf), 0);
+  struct ceph_statx stx;
+  ASSERT_EQ(ceph_fstatx(cmount, fd, &stx, CEPH_STATX_MODE, 0), 0);
   // mode was modified according to ACL
-  ASSERT_EQ(stbuf.st_mode & 0777, 0770u);
-  ASSERT_EQ(check_acl_and_mode(acl_buf, acl_buf_size, stbuf.st_mode), 0);
+  ASSERT_EQ(stx.stx_mode & 0777u, 0770u);
+  ASSERT_EQ(check_acl_and_mode(acl_buf, acl_buf_size, stx.stx_mode), 0);
 
   acl_buf_size = acl_ea_size(3);
   // setting ACL that is equivalent to file mode
@@ -173,9 +173,9 @@ TEST(ACL, SetACL) {
   // ACL was deleted
   ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_ACCESS, NULL, 0), -ENODATA);
 
-  ASSERT_EQ(ceph_fstat(cmount, fd, &stbuf), 0);
+  ASSERT_EQ(ceph_fstatx(cmount, fd, &stx, CEPH_STATX_MODE, 0), 0);
   // mode was modified according to ACL
-  ASSERT_EQ(stbuf.st_mode & 0777, 0600u);
+  ASSERT_EQ(stx.stx_mode & 0777u, 0600u);
 
   free(acl_buf);
   ceph_close(cmount, fd);
@@ -200,20 +200,20 @@ TEST(ACL, Chmod) {
   ASSERT_EQ(generate_test_acl(acl_buf, acl_buf_size, 0775), 0);
   ASSERT_EQ(ceph_fsetxattr(cmount, fd, ACL_EA_ACCESS, acl_buf, acl_buf_size, 0), 0);
 
-  struct stat stbuf;
-  ASSERT_EQ(ceph_fstat(cmount, fd, &stbuf), 0);
+  struct ceph_statx stx;
+  ASSERT_EQ(ceph_fstatx(cmount, fd, &stx, CEPH_STATX_MODE, 0), 0);
   // mode was updated according to ACL
-  ASSERT_EQ(stbuf.st_mode & 0777, 0775u);
+  ASSERT_EQ(stx.stx_mode & 0777u, 0775u);
 
   // change mode
   ASSERT_EQ(ceph_fchmod(cmount, fd, 0640), 0);
 
-  ASSERT_EQ(ceph_fstat(cmount, fd, &stbuf), 0);
-  ASSERT_EQ(stbuf.st_mode & 0777, 0640u);
+  ASSERT_EQ(ceph_fstatx(cmount, fd, &stx, CEPH_STATX_MODE, 0), 0);
+  ASSERT_EQ(stx.stx_mode & 0777u, 0640u);
 
   // ACL was updated according to mode
   ASSERT_EQ(ceph_fgetxattr(cmount, fd, ACL_EA_ACCESS, acl_buf, acl_buf_size), acl_buf_size);
-  ASSERT_EQ(check_acl_and_mode(acl_buf, acl_buf_size, stbuf.st_mode), 0);
+  ASSERT_EQ(check_acl_and_mode(acl_buf, acl_buf_size, stx.stx_mode), 0);
 
   free(acl_buf);
   ceph_close(cmount, fd);
diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc
index 2de3336f11c..bf91bd7228e 100644
--- a/src/test/libcephfs/test.cc
+++ b/src/test/libcephfs/test.cc
@@ -770,8 +770,8 @@ TEST(LibCephFS, FlagO_PATH) {
   // try to sync
   ASSERT_EQ(-EBADF, ceph_fsync(cmount, fd, false));
 
-  struct stat sb;
-  ASSERT_EQ(0, ceph_fstat(cmount, fd, &sb));
+  struct ceph_statx stx;
+  ASSERT_EQ(0, ceph_fstatx(cmount, fd, &stx, 0, 0));
 
   ASSERT_EQ(0, ceph_close(cmount, fd));
   ceph_shutdown(cmount);
@@ -986,8 +986,8 @@ TEST(LibCephFS, BadFileDesc) {
   ASSERT_EQ(ceph_ftruncate(cmount, -1, 0), -EBADF);
   ASSERT_EQ(ceph_fsync(cmount, -1, 0), -EBADF);
 
-  struct stat stat;
-  ASSERT_EQ(ceph_fstat(cmount, -1, &stat), -EBADF);
+  struct ceph_statx stx;
+  ASSERT_EQ(ceph_fstatx(cmount, -1, &stx, 0, 0), -EBADF);
 
   struct sockaddr_storage addr;
   ASSERT_EQ(ceph_get_file_stripe_address(cmount, -1, 0, &addr, 1), -EBADF);
@@ -1175,7 +1175,7 @@ TEST(LibCephFS, UseUnmounted) {
   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_fstat(cmount, 0, &st));
+  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_pool(cmount, 0));