libceph: Convert pr_warning to pr_warn

Use the more common pr_warn.

Other miscellanea:

o Coalesce formats
o Realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index ec4d9e24dcf9..b8c3fde5b04f 100644
--- 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);
@@ -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;
                 }