ceph: fix up the types of the file layout helpers

The helper macros for accessing file layout fields of an on-disk
ceph file layout structure cast their results to type (__s32).  This
is a bit strange, since (with one exception--fl_pg_preferred):
    - there is no need for negative values; and
    - all users of these macros are assigning their result to
      64-bit variables.
So just make these macros return a 64-bit unsigned type.

The exception is the preferred placement group, which remains a
signed 32-bit value.  A placement group id encodes the preferred
primary OSD in a 16-bit value, and there's no sense at this point
getting too far away from that.

And finally, the fl_cas_hash and fl_object_stripe_unit fields are
essentially unused, but are both 32 bits and signed.  Keep their
size, but make them unsigned, since neither a hash nor a stripe
unit has any business having a negative value.

Signed-off-by: Alex Elder <elder@dreamhost.com>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 15f3afd78a8d92f4d2075847f95e755e72625b64..e5347f24e40ed4cba1b254c60ee864a35f75c3ea 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -567,6 +567,7 @@ static int fill_inode(struct inode *inode,
        struct ceph_buffer *xattr_blob = NULL;
        int err = 0;
        int queue_trunc = 0;
+       __u64 stripe_unit;
 
        dout("fill_inode %p ino %llx.%llx v %llu had %llu\n",
             inode, ceph_vinop(inode), le64_to_cpu(info->version),
@@ -642,7 +643,9 @@ static int fill_inode(struct inode *inode,
        }
 
        ci->i_layout = info->layout;
-       inode->i_blkbits = fls(ceph_file_layout_stripe_unit(&info->layout)) - 1;
+       stripe_unit = ceph_file_layout_stripe_unit(&info->layout);
+       BUG_ON(stripe_unit > (__u64) INT_MAX);
+       inode->i_blkbits = fls((int) stripe_unit) - 1;
 
        /* xattrs */
        /* note that if i_xattrs.len <= 4, i_xattrs.data will still be NULL. */

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 75cff032783b95eea6ea25e610084beef7531b68..2fde342161f59e993fea67f941731528fee6f391 100644 (file)
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -22,10 +22,10 @@ static long ceph_ioctl_get_layout(struct file *file, void __user *arg)
 
        err = ceph_do_getattr(file->f_dentry->d_inode, CEPH_STAT_CAP_LAYOUT);
        if (!err) {
-               l.stripe_unit = (__u64) ceph_file_layout_stripe_unit(&ci->i_layout);
-               l.stripe_count = (__u64) ceph_file_layout_stripe_count(&ci->i_layout);
-               l.object_size = (__u64) ceph_file_layout_object_size(&ci->i_layout);
-               l.data_pool = (__u64) ceph_file_layout_pg_pool(&ci->i_layout);
+               l.stripe_unit = ceph_file_layout_stripe_unit(&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 = ceph_file_layout_pg_pool(&ci->i_layout);
                l.preferred_osd =
                        (__s64) ceph_file_layout_pg_preferred(&ci->i_layout);
                if (copy_to_user(arg, &l, sizeof(l)))
@@ -52,12 +52,12 @@ static long ceph_ioctl_set_layout(struct file *file, void __user *arg)
        /* validate changed params against current layout */
        err = ceph_do_getattr(file->f_dentry->d_inode, CEPH_STAT_CAP_LAYOUT);
        if (!err) {
-               nl.stripe_unit = (__u64) ceph_file_layout_stripe_unit(&ci->i_layout);
-               nl.stripe_count = (__u64) ceph_file_layout_stripe_count(&ci->i_layout);
-               nl.object_size = (__u64) ceph_file_layout_object_size(&ci->i_layout);
-               nl.data_pool = (__u64) ceph_file_layout_pg_pool(&ci->i_layout);
+               nl.stripe_unit = ceph_file_layout_stripe_unit(&ci->i_layout);
+               nl.stripe_count = ceph_file_layout_stripe_count(&ci->i_layout);
+               nl.object_size = ceph_file_layout_object_size(&ci->i_layout);
+               nl.data_pool = ceph_file_layout_pg_pool(&ci->i_layout);
                nl.preferred_osd =
-                               (__s64) ceph_file_layout_pg_preferred(&ci->i_layout);
+                       (__s64) ceph_file_layout_pg_preferred(&ci->i_layout);
        } else
                return err;
 
@@ -203,8 +203,8 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
        ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
                                      &dl.object_no, &dl.object_offset, &olen);
        dl.file_offset -= dl.object_offset;
-       dl.object_size = (__u64) ceph_file_layout_object_size(&ci->i_layout);
-       dl.block_size = (__u64) ceph_file_layout_stripe_unit(&ci->i_layout);
+       dl.object_size = ceph_file_layout_object_size(&ci->i_layout);
+       dl.block_size = ceph_file_layout_stripe_unit(&ci->i_layout);
 
        /* block_offset = object_offset % block_size */
        tmp = dl.object_offset;

diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 6450f7ad8e489fbcbd2a5a7c70cf5e8794010834..63fc08013354ce8fef230475d9356caf659e634c 100644 (file)
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -112,20 +112,20 @@ static size_t ceph_vxattrcb_file_layout(struct ceph_inode_info *ci, char *val,
                                   size_t size)
 {
        int ret;
+       __s32 preferred;
 
        ret = snprintf(val, size,
                "chunk_bytes=%lld\nstripe_count=%lld\nobject_size=%lld\n",
-               (unsigned long long)ceph_file_layout_stripe_unit(&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));
+               ceph_file_layout_stripe_unit(&ci->i_layout),
+               ceph_file_layout_stripe_count(&ci->i_layout),
+               ceph_file_layout_object_size(&ci->i_layout));
 
-       if (ceph_file_layout_pg_preferred(&ci->i_layout) !=
-                       CEPH_FILE_LAYOUT_PG_PREFERRED_NONE) {
+       preferred = ceph_file_layout_pg_preferred(&ci->i_layout);
+       if (preferred != CEPH_FILE_LAYOUT_PG_PREFERRED_NONE) {
                val += ret;
                size -= ret;
-               ret += snprintf(val, size, "preferred_osd=%lld\n",
-                           (unsigned long long)ceph_file_layout_pg_preferred(
-                                   &ci->i_layout));
+               ret += snprintf(val, size, "preferred_osd=%d\n",
+                               (int) preferred);
        }
 
        return ret;

diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h
index e66225e98f8d1dc973863b4ef9b9c70f5211693e..145146ab93a58f27525ce3ff849d33f56f1afd3f 100644 (file)
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
@@ -75,32 +75,33 @@ struct ceph_file_layout {
 
 #define CEPH_MIN_STRIPE_UNIT                   65536
 #define CEPH_FILE_LAYOUT_PG_PREFERRED_NONE     ((__s32) -1)
+
 #define ceph_file_layout_stripe_unit(l) \
-               ((__s32) le32_to_cpu((l)->fl_stripe_unit))
+               ((__u64) le32_to_cpu((l)->fl_stripe_unit))
 #define ceph_file_layout_stripe_count(l) \
-               ((__s32) le32_to_cpu((l)->fl_stripe_count))
+               ((__u64) le32_to_cpu((l)->fl_stripe_count))
 #define ceph_file_layout_object_size(l) \
-               ((__s32) le32_to_cpu((l)->fl_object_size))
+               ((__u64) le32_to_cpu((l)->fl_object_size))
 #define ceph_file_layout_cas_hash(l) \
-               ((__s32) le32_to_cpu((l)->fl_cas_hash))
+               ((__u32) le32_to_cpu((l)->fl_cas_hash))
 #define ceph_file_layout_object_stripe_unit(l) \
-               ((__s32) le32_to_cpu((l)->fl_object_stripe_unit))
+               ((__u32) le32_to_cpu((l)->fl_object_stripe_unit))
 #define ceph_file_layout_pg_preferred(l) \
                ((__s32) le32_to_cpu((l)->fl_pg_preferred))
 #define ceph_file_layout_pg_pool(l) \
-               ((__s32) le32_to_cpu((l)->fl_pg_pool))
+               ((__u64) le32_to_cpu((l)->fl_pg_pool))
 
-static inline unsigned ceph_file_layout_stripe_width(struct ceph_file_layout *l)
+static inline __u64 ceph_file_layout_stripe_width(struct ceph_file_layout *l)
 {
-       return (unsigned) (ceph_file_layout_stripe_unit(l) *
-                               ceph_file_layout_stripe_count(l));
+       return ceph_file_layout_stripe_unit(l) *
+                               ceph_file_layout_stripe_count(l);
 }
 
 /* "period" == bytes before i start on a new set of objects */
-static inline unsigned ceph_file_layout_period(struct ceph_file_layout *l)
+static inline __u64 ceph_file_layout_period(struct ceph_file_layout *l)
 {
-       return (unsigned) (ceph_file_layout_object_size(l) *
-                               ceph_file_layout_stripe_count(l));
+       return ceph_file_layout_object_size(l) *
+                               ceph_file_layout_stripe_count(l);
 }
 
 int ceph_file_layout_is_valid(const struct ceph_file_layout *layout);

diff --git a/net/ceph/ceph_fs.c b/net/ceph/ceph_fs.c
index c3197b9e3cc3d8ec2896bbcab786febc65e170f2..97f7c5030a7c6ab8599c93866d03f449aec1c699 100644 (file)
--- a/net/ceph/ceph_fs.c
+++ b/net/ceph/ceph_fs.c
@@ -9,9 +9,9 @@
  */
 int ceph_file_layout_is_valid(const struct ceph_file_layout *layout)
 {
-       __u32 su = (__u32) ceph_file_layout_stripe_unit(layout);
-       __u32 sc = (__u32) ceph_file_layout_stripe_count(layout);
-       __u32 os = (__u32) ceph_file_layout_object_size(layout);
+       __u64 su = ceph_file_layout_stripe_unit(layout);
+       __u64 sc = ceph_file_layout_stripe_count(layout);
+       __u64 os = ceph_file_layout_object_size(layout);
 
        /* stripe unit, object size must be non-zero, 64k increment */
        if (!su || (su & (CEPH_MIN_STRIPE_UNIT-1)))

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index c513200b01c553ce2dd6a68592b8ce70bbdb9aa6..fc3c7176e026d8bc0424c4113da09f83f9e7dde0 100644 (file)
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -946,9 +946,9 @@ void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
                                   u64 *object_ext_off,
                                   u64 *object_ext_len)
 {
-       u64 object_size = (u64) ceph_file_layout_object_size(layout);
-       u64 stripe_unit = (u64) ceph_file_layout_stripe_unit(layout);
-       u64 stripe_count = (u64) ceph_file_layout_stripe_count(layout);
+       u64 object_size = ceph_file_layout_object_size(layout);
+       u64 stripe_unit = ceph_file_layout_stripe_unit(layout);
+       u64 stripe_count = ceph_file_layout_stripe_count(layout);
        u64 stripe_unit_per_object;
        u64 stripe_unit_num;
        u64 stripe_unit_offset;
@@ -1027,22 +1027,26 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol,
                            struct ceph_osdmap *osdmap)
 {
        unsigned num, num_mask;
-       s32 preferred = (s32) ceph_file_layout_pg_preferred(fl);
+       s32 preferred = ceph_file_layout_pg_preferred(fl);
        int poolid = (int) ceph_file_layout_pg_pool(fl);
        struct ceph_pg_pool_info *pool;
        unsigned ps;
 
        BUG_ON(!osdmap);
+       BUG_ON(preferred > (s32) SHRT_MAX);
+       BUG_ON(preferred < (s32) SHRT_MIN);
 
        pool = __lookup_pg_pool(&osdmap->pg_pools, poolid);
        if (!pool)
                return -EIO;
+
        ps = ceph_str_hash(pool->v.object_hash, oid, strlen(oid));
 
        if (preferred == CEPH_FILE_LAYOUT_PG_PREFERRED_NONE) {
                num = le32_to_cpu(pool->v.pg_num);
                num_mask = pool->pg_num_mask;
        } else {
+               BUG_ON(preferred < 0);
                ps += preferred;
                num = le32_to_cpu(pool->v.lpg_num);
                num_mask = pool->lpg_num_mask;
@@ -1050,7 +1054,7 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol,
 
        /* ceph_object_layout is not in CPU byte order... */
        ol->ol_pgid.ps = cpu_to_le16(ps);
-       ol->ol_pgid.preferred = cpu_to_le16(preferred);
+       ol->ol_pgid.preferred = cpu_to_le16((s16) preferred);
        /* ...so don't byte-swap the file layout fields */
        ol->ol_pgid.pool = fl->fl_pg_pool;
        ol->ol_stripe_unit = fl->fl_object_stripe_unit;