client: convert ceph_statx to use dev_t for devices

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index b65c64a9f6ddcfee661648ee83582b24dbce3074..f431b60d9a519a665124b67df8c66f19f8076969 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -6850,16 +6850,14 @@ void Client::fill_statx(Inode *in, unsigned int mask, struct ceph_statx *stx)
     mask = ~0;
 
   /* These are always considered to be available */
-  stx->stx_dev_major = in->snapid >> 32;
-  stx->stx_dev_minor = (uint32_t)in->snapid;
+  stx->stx_dev = in->snapid;
   stx->stx_blksize = MAX(in->layout.stripe_unit, 4096);
 
   if (use_faked_inos())
    stx->stx_ino = in->faked_ino;
   else
     stx->stx_ino = in->ino;
-  stx->stx_rdev_minor = MINOR(in->rdev);
-  stx->stx_rdev_major = MAJOR(in->rdev);
+  stx->stx_rdev = in->rdev;
   stx->stx_mask |= (CEPH_STATX_INO|CEPH_STATX_RDEV);
 
   if (mask & CEPH_CAP_AUTH_SHARED) {

diff --git a/src/include/cephfs/ceph_statx.h b/src/include/cephfs/ceph_statx.h
index 324dd1ec02132e0b103298ddb49e6a76353168bc..81f21614232e30343921ca067d40609040ad0168 100644 (file)
--- a/src/include/cephfs/ceph_statx.h
+++ b/src/include/cephfs/ceph_statx.h
@@ -40,14 +40,12 @@ struct ceph_statx {
        uint64_t        stx_size;
        uint64_t        stx_blocks;
        uint64_t        stx_version;
+       dev_t           stx_dev;
+       dev_t           stx_rdev;
        struct timespec stx_atime;
        struct timespec stx_btime;
        struct timespec stx_ctime;
        struct timespec stx_mtime;
-       uint32_t        stx_rdev_major;
-       uint32_t        stx_rdev_minor;
-       uint32_t        stx_dev_major;
-       uint32_t        stx_dev_minor;
 };
 
 #define CEPH_STATX_MODE                0x00000001U     /* Want/got stx_mode */