Merge tag 'v3.5-rc1'

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / ceph / osdmap.c

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index d3de09f..9600674 100644 (file)
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -38,7 +38,7 @@ done:
 
 /* maps */
 
-static int calc_bits_of(unsigned t)
+static int calc_bits_of(unsigned int t)
 {
        int b = 0;
        while (t) {
@@ -154,7 +154,7 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
        magic = ceph_decode_32(p);
        if (magic != CRUSH_MAGIC) {
                pr_err("crush_decode magic %x != current %x\n",
-                      (unsigned)magic, (unsigned)CRUSH_MAGIC);
+                      (unsigned int)magic, (unsigned int)CRUSH_MAGIC);
                goto bad;
        }
        c->max_buckets = ceph_decode_32(p);
@@ -453,7 +453,7 @@ static void __remove_pg_pool(struct rb_root *root, struct ceph_pg_pool_info *pi)
 
 static int __decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi)
 {
-       unsigned n, m;
+       unsigned int n, m;
 
        ceph_decode_copy(p, &pi->v, sizeof(pi->v));
        calc_pg_masks(pi);
@@ -975,7 +975,7 @@ void ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
        objsetno = stripeno / su_per_object;
 
        *ono = objsetno * sc + stripepos;
-       dout("objset %u * sc %u = ono %u\n", objsetno, sc, (unsigned)*ono);
+       dout("objset %u * sc %u = ono %u\n", objsetno, sc, (unsigned int)*ono);
 
        /* *oxoff = *off % layout->fl_stripe_unit;  # offset in su */
        t = off;
@@ -1003,11 +1003,11 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol,
                            struct ceph_file_layout *fl,
                            struct ceph_osdmap *osdmap)
 {
-       unsigned num, num_mask;
+       unsigned int num, num_mask;
        struct ceph_pg pgid;
        int poolid = le32_to_cpu(fl->fl_pg_pool);
        struct ceph_pg_pool_info *pool;
-       unsigned ps;
+       unsigned int ps;
 
        BUG_ON(!osdmap);
 
@@ -1039,7 +1039,7 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
        struct ceph_pg_mapping *pg;
        struct ceph_pg_pool_info *pool;
        int ruleno;
-       unsigned poolid, ps, pps, t, r;
+       unsigned int poolid, ps, pps, t, r;
 
        poolid = le32_to_cpu(pgid.pool);
        ps = le16_to_cpu(pgid.ps);