libceph: define new ceph_file_layout structure

Define new ceph_file_layout structure and rename old ceph_file_layout
to ceph_file_layout_legacy. This is preparation for adding namespace
to ceph_file_layout structure.

Signed-off-by: Yan, Zheng <zyan@redhat.com>

7 files changed, 43 insertions, 45 deletions

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 26a9d10d75e9..3f8efd866fec 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1730,7 +1730,7 @@ enum {
         POOL_WRITE      = 2,
 };
 
-static int __ceph_pool_perm_get(struct ceph_inode_info *ci, u32 pool)
+static int __ceph_pool_perm_get(struct ceph_inode_info *ci, s64 pool)
 {
         struct ceph_fs_client *fsc = ceph_inode_to_client(&ci->vfs_inode);
         struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -1757,7 +1757,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci, u32 pool)
         if (*p)
                 goto out;
 
-        dout("__ceph_pool_perm_get pool %u no perm cached\n", pool);
+        dout("__ceph_pool_perm_get pool %lld no perm cached\n", pool);
 
         down_write(&mdsc->pool_perm_rwsem);
         parent = NULL;
@@ -1860,13 +1860,13 @@ out_unlock:
 out:
         if (!err)
                 err = have;
-        dout("__ceph_pool_perm_get pool %u result = %d\n", pool, err);
+        dout("__ceph_pool_perm_get pool %lld result = %d\n", pool, err);
         return err;
 }
 
 int ceph_pool_perm_check(struct ceph_inode_info *ci, int need)
 {
-        u32 pool;
+        s64 pool;
         int ret, flags;
 
         /* does not support pool namespace yet */
@@ -1879,17 +1879,17 @@ int ceph_pool_perm_check(struct ceph_inode_info *ci, int need)
 
         spin_lock(&ci->i_ceph_lock);
         flags = ci->i_ceph_flags;
-        pool = ceph_file_layout_pg_pool(ci->i_layout);
+        pool = ci->i_layout.pool_id;
         spin_unlock(&ci->i_ceph_lock);
 check:
         if (flags & CEPH_I_POOL_PERM) {
                 if ((need & CEPH_CAP_FILE_RD) && !(flags & CEPH_I_POOL_RD)) {
-                        dout("ceph_pool_perm_check pool %u no read perm\n",
+                        dout("ceph_pool_perm_check pool %lld no read perm\n",
                              pool);
                         return -EPERM;
                 }
                 if ((need & CEPH_CAP_FILE_WR) && !(flags & CEPH_I_POOL_WR)) {
-                        dout("ceph_pool_perm_check pool %u no write perm\n",
+                        dout("ceph_pool_perm_check pool %lld no write perm\n",
                              pool);
                         return -EPERM;
                 }
@@ -1907,10 +1907,10 @@ check:
                 flags |= CEPH_I_POOL_WR;
 
         spin_lock(&ci->i_ceph_lock);
-        if (pool == ceph_file_layout_pg_pool(ci->i_layout)) {
+        if (pool == ci->i_layout.pool_id) {
                 ci->i_ceph_flags = flags;
         } else {
-                pool = ceph_file_layout_pg_pool(ci->i_layout);
+                pool = ci->i_layout.pool_id;
                 flags = ci->i_ceph_flags;
         }
         spin_unlock(&ci->i_ceph_lock);
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 6f60d0a3d0f9..f24722dce167 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2895,8 +2895,11 @@ static void handle_cap_grant(struct ceph_mds_client *mdsc,
 
         if (newcaps & (CEPH_CAP_ANY_FILE_RD | CEPH_CAP_ANY_FILE_WR)) {
                 /* file layout may have changed */
-                ci->i_layout = grant->layout;
+                s64 old_pool = ci->i_layout.pool_id;
+                ceph_file_layout_from_legacy(&ci->i_layout, &grant->layout);
                 ci->i_pool_ns_len = pool_ns_len;
+                if (ci->i_layout.pool_id != old_pool)
+                        ci->i_ceph_flags &= ~CEPH_I_POOL_PERM;
 
                 /* size/truncate_seq? */
                 queue_trunc = ceph_fill_file_size(inode, issued,
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 0daaf7ceedc5..cba5dcf49a65 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1583,9 +1583,9 @@ static int ceph_zero_objects(struct inode *inode, loff_t offset, loff_t length)
 {
         int ret = 0;
         struct ceph_inode_info *ci = ceph_inode(inode);
-        s32 stripe_unit = ceph_file_layout_su(ci->i_layout);
-        s32 stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
-        s32 object_size = ceph_file_layout_object_size(ci->i_layout);
+        s32 stripe_unit = ci->i_layout.stripe_unit;
+        s32 stripe_count = ci->i_layout.stripe_count;
+        s32 object_size = ci->i_layout.object_size;
         u64 object_set_size = object_size * stripe_count;
         u64 nearly, t;
 
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index f059b5997072..6c5903e0a976 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -814,10 +814,11 @@ static int fill_inode(struct inode *inode, struct page *locked_page,
 
         if (new_version ||
             (new_issued & (CEPH_CAP_ANY_FILE_RD | CEPH_CAP_ANY_FILE_WR))) {
-                if (ci->i_layout.fl_pg_pool != info->layout.fl_pg_pool)
-                        ci->i_ceph_flags &= ~CEPH_I_POOL_PERM;
-                ci->i_layout = info->layout;
+                s64 old_pool = ci->i_layout.pool_id;
+                ceph_file_layout_from_legacy(&ci->i_layout, &info->layout);
                 ci->i_pool_ns_len = iinfo->pool_ns_len;
+                if (ci->i_layout.pool_id != old_pool)
+                        ci->i_ceph_flags &= ~CEPH_I_POOL_PERM;
 
                 queue_trunc = ceph_fill_file_size(inode, issued,
                                         le32_to_cpu(info->truncate_seq),
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 0946f2d4a81f..843dd31a02cd 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -21,10 +21,10 @@ static long ceph_ioctl_get_layout(struct file *file, void __user *arg)
 
         err = ceph_do_getattr(file_inode(file), CEPH_STAT_CAP_LAYOUT, false);
         if (!err) {
-                l.stripe_unit = ceph_file_layout_su(ci->i_layout);
-                l.stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
-                l.object_size = ceph_file_layout_object_size(ci->i_layout);
-                l.data_pool = le32_to_cpu(ci->i_layout.fl_pg_pool);
+                l.stripe_unit = ci->i_layout.stripe_unit;
+                l.stripe_count = ci->i_layout.stripe_count;
+                l.object_size = ci->i_layout.object_size;
+                l.data_pool = ci->i_layout.pool_id;
                 l.preferred_osd = (s32)-1;
                 if (copy_to_user(arg, &l, sizeof(l)))
                         return -EFAULT;
@@ -82,19 +82,19 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
         if (l.stripe_count)
                 nl.stripe_count = l.stripe_count;
         else
-                nl.stripe_count = ceph_file_layout_stripe_count(ci->i_layout);
+                nl.stripe_count = ci->i_layout.stripe_count;
         if (l.stripe_unit)
                 nl.stripe_unit = l.stripe_unit;
         else
-                nl.stripe_unit = ceph_file_layout_su(ci->i_layout);
+                nl.stripe_unit = ci->i_layout.stripe_unit;
         if (l.object_size)
                 nl.object_size = l.object_size;
         else
-                nl.object_size = ceph_file_layout_object_size(ci->i_layout);
+                nl.object_size = ci->i_layout.object_size;
         if (l.data_pool)
                 nl.data_pool = l.data_pool;
         else
-                nl.data_pool = ceph_file_layout_pg_pool(ci->i_layout);
+                nl.data_pool = ci->i_layout.pool_id;
 
         /* this is obsolete, and always -1 */
         nl.preferred_osd = le64_to_cpu(-1);
@@ -202,8 +202,8 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
                 return -EIO;
         }
         dl.file_offset -= dl.object_offset;
-        dl.object_size = ceph_file_layout_object_size(ci->i_layout);
-        dl.block_size = ceph_file_layout_su(ci->i_layout);
+        dl.object_size = ci->i_layout.object_size;
+        dl.block_size = ci->i_layout.stripe_unit;
 
         /* block_offset = object_offset % block_size */
         tmp = dl.object_offset;
@@ -212,7 +212,7 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
         snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
                  ceph_ino(inode), dl.object_no);
 
-        oloc.pool = ceph_file_layout_pg_pool(ci->i_layout);
+        oloc.pool = ci->i_layout.pool_id;
         ceph_oid_printf(&oid, "%s", dl.object_name);
 
         r = ceph_object_locator_to_pg(osdc->osdmap, &oid, &oloc, &pgid);
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index e7d38aac7109..75ecf967d0b7 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -275,8 +275,8 @@ struct ceph_mds_request {
 
 struct ceph_pool_perm {
         struct rb_node node;
-        u32 pool;
         int perm;
+        s64 pool;
 };
 
 /*
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 4870b29df224..5377c9c7a0c5 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -72,7 +72,7 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
         int ret;
         struct ceph_fs_client *fsc = ceph_sb_to_client(ci->vfs_inode.i_sb);
         struct ceph_osd_client *osdc = &fsc->client->osdc;
-        s64 pool = ceph_file_layout_pg_pool(ci->i_layout);
+        s64 pool = ci->i_layout.pool_id;
         const char *pool_name;
         char buf[128];
 
@@ -82,10 +82,9 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
         if (pool_name) {
                 size_t len = strlen(pool_name);
                 ret = snprintf(buf, sizeof(buf),
-                "stripe_unit=%lld stripe_count=%lld object_size=%lld pool=",
-                (unsigned long long)ceph_file_layout_su(ci->i_layout),
-                (unsigned long long)ceph_file_layout_stripe_count(ci->i_layout),
-                (unsigned long long)ceph_file_layout_object_size(ci->i_layout));
+                "stripe_unit=%u stripe_count=%u object_size=%u pool=",
+                ci->i_layout.stripe_unit, ci->i_layout.stripe_count,
+                ci->i_layout.object_size);
                 if (!size) {
                         ret += len;
                 } else if (ret + len > size) {
@@ -97,11 +96,9 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
                 }
         } else {
                 ret = snprintf(buf, sizeof(buf),
-                "stripe_unit=%lld stripe_count=%lld object_size=%lld pool=%lld",
-                (unsigned long long)ceph_file_layout_su(ci->i_layout),
-                (unsigned long long)ceph_file_layout_stripe_count(ci->i_layout),
-                (unsigned long long)ceph_file_layout_object_size(ci->i_layout),
-                (unsigned long long)pool);
+                "stripe_unit=%u stripe_count=%u object_size=%u pool=%lld",
+                ci->i_layout.stripe_unit, ci->i_layout.stripe_count,
+                ci->i_layout.object_size, (unsigned long long)pool);
                 if (size) {
                         if (ret <= size)
                                 memcpy(val, buf, ret);
@@ -116,22 +113,19 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,
 static size_t ceph_vxattrcb_layout_stripe_unit(struct ceph_inode_info *ci,
                                                char *val, size_t size)
 {
-        return snprintf(val, size, "%lld",
-                        (unsigned long long)ceph_file_layout_su(ci->i_layout));
+        return snprintf(val, size, "%u", ci->i_layout.stripe_unit);
 }
 
 static size_t ceph_vxattrcb_layout_stripe_count(struct ceph_inode_info *ci,
                                                 char *val, size_t size)
 {
-        return snprintf(val, size, "%lld",
-               (unsigned long long)ceph_file_layout_stripe_count(ci->i_layout));
+        return snprintf(val, size, "%u", ci->i_layout.stripe_count);
 }
 
 static size_t ceph_vxattrcb_layout_object_size(struct ceph_inode_info *ci,
                                                char *val, size_t size)
 {
-        return snprintf(val, size, "%lld",
-               (unsigned long long)ceph_file_layout_object_size(ci->i_layout));
+        return snprintf(val, size, "%u", ci->i_layout.object_size);
 }
 
 static size_t ceph_vxattrcb_layout_pool(struct ceph_inode_info *ci,
@@ -140,7 +134,7 @@ static size_t ceph_vxattrcb_layout_pool(struct ceph_inode_info *ci,
         int ret;
         struct ceph_fs_client *fsc = ceph_sb_to_client(ci->vfs_inode.i_sb);
         struct ceph_osd_client *osdc = &fsc->client->osdc;
-        s64 pool = ceph_file_layout_pg_pool(ci->i_layout);
+        s64 pool = ci->i_layout.pool_id;
         const char *pool_name;
 
         down_read(&osdc->lock);