Merge tag 'mac80211-for-john-2014-11-18' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / ceph / osdmap.c

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index c547e46..b8c3fde 100644 (file)
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -521,11 +521,11 @@ static int decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi)
        ev = ceph_decode_8(p);  /* encoding version */
        cv = ceph_decode_8(p); /* compat version */
        if (ev < 5) {
-               pr_warning("got v %d < 5 cv %d of ceph_pg_pool\n", ev, cv);
+               pr_warn("got v %d < 5 cv %d of ceph_pg_pool\n", ev, cv);
                return -EINVAL;
        }
        if (cv > 9) {
-               pr_warning("got v %d cv %d > 9 of ceph_pg_pool\n", ev, cv);
+               pr_warn("got v %d cv %d > 9 of ceph_pg_pool\n", ev, cv);
                return -EINVAL;
        }
        len = ceph_decode_32(p);
@@ -671,26 +671,26 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
        int i;
 
        state = krealloc(map->osd_state, max*sizeof(*state), GFP_NOFS);
+       if (!state)
+               return -ENOMEM;
+       map->osd_state = state;
+
        weight = krealloc(map->osd_weight, max*sizeof(*weight), GFP_NOFS);
-       addr = krealloc(map->osd_addr, max*sizeof(*addr), GFP_NOFS);
-       if (!state || !weight || !addr) {
-               kfree(state);
-               kfree(weight);
-               kfree(addr);
+       if (!weight)
+               return -ENOMEM;
+       map->osd_weight = weight;
 
+       addr = krealloc(map->osd_addr, max*sizeof(*addr), GFP_NOFS);
+       if (!addr)
                return -ENOMEM;
-       }
+       map->osd_addr = addr;
 
        for (i = map->max_osd; i < max; i++) {
-               state[i] = 0;
-               weight[i] = CEPH_OSD_OUT;
-               memset(addr + i, 0, sizeof(*addr));
+               map->osd_state[i] = 0;
+               map->osd_weight[i] = CEPH_OSD_OUT;
+               memset(map->osd_addr + i, 0, sizeof(*map->osd_addr));
        }
 
-       map->osd_state = state;
-       map->osd_weight = weight;
-       map->osd_addr = addr;
-
        if (map->osd_primary_affinity) {
                u32 *affinity;
 
@@ -698,11 +698,11 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
                                    max*sizeof(*affinity), GFP_NOFS);
                if (!affinity)
                        return -ENOMEM;
+               map->osd_primary_affinity = affinity;
 
                for (i = map->max_osd; i < max; i++)
-                       affinity[i] = CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;
-
-               map->osd_primary_affinity = affinity;
+                       map->osd_primary_affinity[i] =
+                           CEPH_OSD_DEFAULT_PRIMARY_AFFINITY;
        }
 
        map->max_osd = max;
@@ -729,9 +729,9 @@ static int get_osdmap_client_data_v(void **p, void *end,
 
                ceph_decode_8_safe(p, end, struct_compat, e_inval);
                if (struct_compat > OSDMAP_WRAPPER_COMPAT_VER) {
-                       pr_warning("got v %d cv %d > %d of %s ceph_osdmap\n",
-                                  struct_v, struct_compat,
-                                  OSDMAP_WRAPPER_COMPAT_VER, prefix);
+                       pr_warn("got v %d cv %d > %d of %s ceph_osdmap\n",
+                               struct_v, struct_compat,
+                               OSDMAP_WRAPPER_COMPAT_VER, prefix);
                        return -EINVAL;
                }
                *p += 4; /* ignore wrapper struct_len */
@@ -739,9 +739,9 @@ static int get_osdmap_client_data_v(void **p, void *end,
                ceph_decode_8_safe(p, end, struct_v, e_inval);
                ceph_decode_8_safe(p, end, struct_compat, e_inval);
                if (struct_compat > OSDMAP_CLIENT_DATA_COMPAT_VER) {
-                       pr_warning("got v %d cv %d > %d of %s ceph_osdmap client data\n",
-                                  struct_v, struct_compat,
-                                  OSDMAP_CLIENT_DATA_COMPAT_VER, prefix);
+                       pr_warn("got v %d cv %d > %d of %s ceph_osdmap client data\n",
+                               struct_v, struct_compat,
+                               OSDMAP_CLIENT_DATA_COMPAT_VER, prefix);
                        return -EINVAL;
                }
                *p += 4; /* ignore client data struct_len */
@@ -751,8 +751,8 @@ static int get_osdmap_client_data_v(void **p, void *end,
                *p -= 1;
                ceph_decode_16_safe(p, end, version, e_inval);
                if (version < 6) {
-                       pr_warning("got v %d < 6 of %s ceph_osdmap\n", version,
-                                  prefix);
+                       pr_warn("got v %d < 6 of %s ceph_osdmap\n",
+                               version, prefix);
                        return -EINVAL;
                }