9p: Reduce object size with CONFIG_NET_9P_DEBUG

Reduce object size by deduplicating formats.

Use vsprintf extension %pV.
Rename P9_DPRINTK uses to p9_debug, align arguments.
Add function for _p9_debug and macro to add __func__.
Add missing "\n"s to p9_debug uses.
Remove embedded function names as p9_debug adds it.
Remove P9_EPRINTK macro and convert use to pr_<level>.
Add and use pr_fmt and pr_<level>.

$ size fs/9p/built-in.o*
   text	   data	    bss	    dec	    hex	filename
  62133	    984	  16000	  79117	  1350d	fs/9p/built-in.o.new
  67342	    984	  16928	  85254	  14d06	fs/9p/built-in.o.old
$ size net/9p/built-in.o*
   text	   data	    bss	    dec	    hex	filename
  88792	   4148	  22024	 114964	  1c114	net/9p/built-in.o.new
  94072	   4148	  23232	 121452	  1da6c	net/9p/built-in.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c
index 159c50f1c6bf..2c69ddd691a1 100644
--- a/net/9p/trans_rdma.c
+++ b/net/9p/trans_rdma.c
@@ -26,6 +26,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/in.h>
 #include <linux/module.h>
 #include <linux/net.h>
@@ -178,8 +180,8 @@ static int parse_opts(char *params, struct p9_rdma_opts *opts)
 
         tmp_options = kstrdup(params, GFP_KERNEL);
         if (!tmp_options) {
-                P9_DPRINTK(P9_DEBUG_ERROR,
-                           "failed to allocate copy of option string\n");
+                p9_debug(P9_DEBUG_ERROR,
+                         "failed to allocate copy of option string\n");
                 return -ENOMEM;
         }
         options = tmp_options;
@@ -192,8 +194,8 @@ static int parse_opts(char *params, struct p9_rdma_opts *opts)
                 token = match_token(p, tokens, args);
                 r = match_int(&args[0], &option);
                 if (r < 0) {
-                        P9_DPRINTK(P9_DEBUG_ERROR,
-                                   "integer field, but no integer?\n");
+                        p9_debug(P9_DEBUG_ERROR,
+                                 "integer field, but no integer?\n");
                         continue;
                 }
                 switch (token) {
@@ -301,8 +303,7 @@ handle_recv(struct p9_client *client, struct p9_trans_rdma *rdma,
         return;
 
  err_out:
-        P9_DPRINTK(P9_DEBUG_ERROR, "req %p err %d status %d\n",
-                   req, err, status);
+        p9_debug(P9_DEBUG_ERROR, "req %p err %d status %d\n", req, err, status);
         rdma->state = P9_RDMA_FLUSHING;
         client->status = Disconnected;
 }
@@ -318,8 +319,8 @@ handle_send(struct p9_client *client, struct p9_trans_rdma *rdma,
 
 static void qp_event_handler(struct ib_event *event, void *context)
 {
-        P9_DPRINTK(P9_DEBUG_ERROR, "QP event %d context %p\n", event->event,
-                                                                context);
+        p9_debug(P9_DEBUG_ERROR, "QP event %d context %p\n",
+                 event->event, context);
 }
 
 static void cq_comp_handler(struct ib_cq *cq, void *cq_context)
@@ -345,8 +346,7 @@ static void cq_comp_handler(struct ib_cq *cq, void *cq_context)
                         break;
 
                 default:
-                        printk(KERN_ERR "9prdma: unexpected completion type, "
-                               "c->wc_op=%d, wc.opcode=%d, status=%d\n",
+                        pr_err("unexpected completion type, c->wc_op=%d, wc.opcode=%d, status=%d\n",
                                c->wc_op, wc.opcode, wc.status);
                         break;
                 }
@@ -356,7 +356,7 @@ static void cq_comp_handler(struct ib_cq *cq, void *cq_context)
 
 static void cq_event_handler(struct ib_event *e, void *v)
 {
-        P9_DPRINTK(P9_DEBUG_ERROR, "CQ event %d context %p\n", e->event, v);
+        p9_debug(P9_DEBUG_ERROR, "CQ event %d context %p\n", e->event, v);
 }
 
 static void rdma_destroy_trans(struct p9_trans_rdma *rdma)
@@ -407,7 +407,7 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c)
         return ib_post_recv(rdma->qp, &wr, &bad_wr);
 
  error:
-        P9_DPRINTK(P9_DEBUG_ERROR, "EIO\n");
+        p9_debug(P9_DEBUG_ERROR, "EIO\n");
         return -EIO;
 }
 
@@ -500,7 +500,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req)
         kfree(c);
         kfree(rpl_context->rc);
         kfree(rpl_context);
-        P9_DPRINTK(P9_DEBUG_ERROR, "EIO\n");
+        p9_debug(P9_DEBUG_ERROR, "EIO\n");
         return -EIO;
  err_free1:
         kfree(rpl_context->rc);