Merge commit 'v3.3-rc1' into stable/for-linus-fixes-3.3

[~andy/linux] / net / 9p / trans_fd.c

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index fdfdb5747f63b6492fc23eafa000dcd7d93c9c5b..fccae26fa67441bbdb5b239eda94fb09417d87a7 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -25,6 +25,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/in.h>
 #include <linux/module.h>
 #include <linux/net.h>
@@ -191,7 +193,7 @@ static void p9_conn_cancel(struct p9_conn *m, int err)
        unsigned long flags;
        LIST_HEAD(cancel_list);
 
-       P9_DPRINTK(P9_DEBUG_ERROR, "mux %p err %d\n", m, err);
+       p9_debug(P9_DEBUG_ERROR, "mux %p err %d\n", m, err);
 
        spin_lock_irqsave(&m->client->lock, flags);
 
@@ -217,7 +219,7 @@ static void p9_conn_cancel(struct p9_conn *m, int err)
        spin_unlock_irqrestore(&m->client->lock, flags);
 
        list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) {
-               P9_DPRINTK(P9_DEBUG_ERROR, "call back req %p\n", req);
+               p9_debug(P9_DEBUG_ERROR, "call back req %p\n", req);
                list_del(&req->req_list);
                p9_client_cb(m->client, req);
        }
@@ -275,7 +277,7 @@ static int p9_fd_read(struct p9_client *client, void *v, int len)
                return -EREMOTEIO;
 
        if (!(ts->rd->f_flags & O_NONBLOCK))
-               P9_DPRINTK(P9_DEBUG_ERROR, "blocking read ...\n");
+               p9_debug(P9_DEBUG_ERROR, "blocking read ...\n");
 
        ret = kernel_read(ts->rd, ts->rd->f_pos, v, len);
        if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
@@ -299,7 +301,7 @@ static void p9_read_work(struct work_struct *work)
        if (m->err < 0)
                return;
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "start mux %p pos %d\n", m, m->rpos);
+       p9_debug(P9_DEBUG_TRANS, "start mux %p pos %d\n", m, m->rpos);
 
        if (!m->rbuf) {
                m->rbuf = m->tmp_buf;
@@ -308,11 +310,11 @@ static void p9_read_work(struct work_struct *work)
        }
 
        clear_bit(Rpending, &m->wsched);
-       P9_DPRINTK(P9_DEBUG_TRANS, "read mux %p pos %d size: %d = %d\n", m,
-                                       m->rpos, m->rsize, m->rsize-m->rpos);
+       p9_debug(P9_DEBUG_TRANS, "read mux %p pos %d size: %d = %d\n",
+                m, m->rpos, m->rsize, m->rsize-m->rpos);
        err = p9_fd_read(m->client, m->rbuf + m->rpos,
                                                m->rsize - m->rpos);
-       P9_DPRINTK(P9_DEBUG_TRANS, "mux %p got %d bytes\n", m, err);
+       p9_debug(P9_DEBUG_TRANS, "mux %p got %d bytes\n", m, err);
        if (err == -EAGAIN) {
                clear_bit(Rworksched, &m->wsched);
                return;
@@ -325,25 +327,25 @@ static void p9_read_work(struct work_struct *work)
 
        if ((!m->req) && (m->rpos == m->rsize)) { /* header read in */
                u16 tag;
-               P9_DPRINTK(P9_DEBUG_TRANS, "got new header\n");
+               p9_debug(P9_DEBUG_TRANS, "got new header\n");
 
                n = le32_to_cpu(*(__le32 *) m->rbuf); /* read packet size */
                if (n >= m->client->msize) {
-                       P9_DPRINTK(P9_DEBUG_ERROR,
-                               "requested packet size too big: %d\n", n);
+                       p9_debug(P9_DEBUG_ERROR,
+                                "requested packet size too big: %d\n", n);
                        err = -EIO;
                        goto error;
                }
 
                tag = le16_to_cpu(*(__le16 *) (m->rbuf+5)); /* read tag */
-               P9_DPRINTK(P9_DEBUG_TRANS,
-                       "mux %p pkt: size: %d bytes tag: %d\n", m, n, tag);
+               p9_debug(P9_DEBUG_TRANS,
+                        "mux %p pkt: size: %d bytes tag: %d\n", m, n, tag);
 
                m->req = p9_tag_lookup(m->client, tag);
                if (!m->req || (m->req->status != REQ_STATUS_SENT &&
                                        m->req->status != REQ_STATUS_FLSH)) {
-                       P9_DPRINTK(P9_DEBUG_ERROR, "Unexpected packet tag %d\n",
-                                                                tag);
+                       p9_debug(P9_DEBUG_ERROR, "Unexpected packet tag %d\n",
+                                tag);
                        err = -EIO;
                        goto error;
                }
@@ -364,7 +366,7 @@ static void p9_read_work(struct work_struct *work)
 
        /* not an else because some packets (like clunk) have no payload */
        if ((m->req) && (m->rpos == m->rsize)) { /* packet is read in */
-               P9_DPRINTK(P9_DEBUG_TRANS, "got new packet\n");
+               p9_debug(P9_DEBUG_TRANS, "got new packet\n");
                spin_lock(&m->client->lock);
                if (m->req->status != REQ_STATUS_ERROR)
                        m->req->status = REQ_STATUS_RCVD;
@@ -384,7 +386,7 @@ static void p9_read_work(struct work_struct *work)
                        n = p9_fd_poll(m->client, NULL);
 
                if (n & POLLIN) {
-                       P9_DPRINTK(P9_DEBUG_TRANS, "sched read work %p\n", m);
+                       p9_debug(P9_DEBUG_TRANS, "sched read work %p\n", m);
                        schedule_work(&m->rq);
                } else
                        clear_bit(Rworksched, &m->wsched);
@@ -418,7 +420,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
                return -EREMOTEIO;
 
        if (!(ts->wr->f_flags & O_NONBLOCK))
-               P9_DPRINTK(P9_DEBUG_ERROR, "blocking write ...\n");
+               p9_debug(P9_DEBUG_ERROR, "blocking write ...\n");
 
        oldfs = get_fs();
        set_fs(get_ds());
@@ -460,7 +462,7 @@ static void p9_write_work(struct work_struct *work)
                req = list_entry(m->unsent_req_list.next, struct p9_req_t,
                               req_list);
                req->status = REQ_STATUS_SENT;
-               P9_DPRINTK(P9_DEBUG_TRANS, "move req %p\n", req);
+               p9_debug(P9_DEBUG_TRANS, "move req %p\n", req);
                list_move_tail(&req->req_list, &m->req_list);
 
                m->wbuf = req->tc->sdata;
@@ -469,11 +471,11 @@ static void p9_write_work(struct work_struct *work)
                spin_unlock(&m->client->lock);
        }
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "mux %p pos %d size %d\n", m, m->wpos,
-                                                               m->wsize);
+       p9_debug(P9_DEBUG_TRANS, "mux %p pos %d size %d\n",
+                m, m->wpos, m->wsize);
        clear_bit(Wpending, &m->wsched);
        err = p9_fd_write(m->client, m->wbuf + m->wpos, m->wsize - m->wpos);
-       P9_DPRINTK(P9_DEBUG_TRANS, "mux %p sent %d bytes\n", m, err);
+       p9_debug(P9_DEBUG_TRANS, "mux %p sent %d bytes\n", m, err);
        if (err == -EAGAIN) {
                clear_bit(Wworksched, &m->wsched);
                return;
@@ -497,7 +499,7 @@ static void p9_write_work(struct work_struct *work)
                        n = p9_fd_poll(m->client, NULL);
 
                if (n & POLLOUT) {
-                       P9_DPRINTK(P9_DEBUG_TRANS, "sched write work %p\n", m);
+                       p9_debug(P9_DEBUG_TRANS, "sched write work %p\n", m);
                        schedule_work(&m->wq);
                } else
                        clear_bit(Wworksched, &m->wsched);
@@ -551,7 +553,7 @@ p9_pollwait(struct file *filp, wait_queue_head_t *wait_address, poll_table *p)
        }
 
        if (!pwait) {
-               P9_DPRINTK(P9_DEBUG_ERROR, "not enough wait_address slots\n");
+               p9_debug(P9_DEBUG_ERROR, "not enough wait_address slots\n");
                return;
        }
 
@@ -573,8 +575,7 @@ static struct p9_conn *p9_conn_create(struct p9_client *client)
        int n;
        struct p9_conn *m;
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "client %p msize %d\n", client,
-                                                               client->msize);
+       p9_debug(P9_DEBUG_TRANS, "client %p msize %d\n", client, client->msize);
        m = kzalloc(sizeof(struct p9_conn), GFP_KERNEL);
        if (!m)
                return ERR_PTR(-ENOMEM);
@@ -591,12 +592,12 @@ static struct p9_conn *p9_conn_create(struct p9_client *client)
 
        n = p9_fd_poll(client, &m->pt);
        if (n & POLLIN) {
-               P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can read\n", m);
+               p9_debug(P9_DEBUG_TRANS, "mux %p can read\n", m);
                set_bit(Rpending, &m->wsched);
        }
 
        if (n & POLLOUT) {
-               P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can write\n", m);
+               p9_debug(P9_DEBUG_TRANS, "mux %p can write\n", m);
                set_bit(Wpending, &m->wsched);
        }
 
@@ -618,7 +619,7 @@ static void p9_poll_mux(struct p9_conn *m)
 
        n = p9_fd_poll(m->client, NULL);
        if (n < 0 || n & (POLLERR | POLLHUP | POLLNVAL)) {
-               P9_DPRINTK(P9_DEBUG_TRANS, "error mux %p err %d\n", m, n);
+               p9_debug(P9_DEBUG_TRANS, "error mux %p err %d\n", m, n);
                if (n >= 0)
                        n = -ECONNRESET;
                p9_conn_cancel(m, n);
@@ -626,19 +627,19 @@ static void p9_poll_mux(struct p9_conn *m)
 
        if (n & POLLIN) {
                set_bit(Rpending, &m->wsched);
-               P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can read\n", m);
+               p9_debug(P9_DEBUG_TRANS, "mux %p can read\n", m);
                if (!test_and_set_bit(Rworksched, &m->wsched)) {
-                       P9_DPRINTK(P9_DEBUG_TRANS, "sched read work %p\n", m);
+                       p9_debug(P9_DEBUG_TRANS, "sched read work %p\n", m);
                        schedule_work(&m->rq);
                }
        }
 
        if (n & POLLOUT) {
                set_bit(Wpending, &m->wsched);
-               P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can write\n", m);
+               p9_debug(P9_DEBUG_TRANS, "mux %p can write\n", m);
                if ((m->wsize || !list_empty(&m->unsent_req_list)) &&
                    !test_and_set_bit(Wworksched, &m->wsched)) {
-                       P9_DPRINTK(P9_DEBUG_TRANS, "sched write work %p\n", m);
+                       p9_debug(P9_DEBUG_TRANS, "sched write work %p\n", m);
                        schedule_work(&m->wq);
                }
        }
@@ -661,8 +662,8 @@ static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)
        struct p9_trans_fd *ts = client->trans;
        struct p9_conn *m = ts->conn;
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "mux %p task %p tcall %p id %d\n", m,
-                                               current, req->tc, req->tc->id);
+       p9_debug(P9_DEBUG_TRANS, "mux %p task %p tcall %p id %d\n",
+                m, current, req->tc, req->tc->id);
        if (m->err < 0)
                return m->err;
 
@@ -686,7 +687,7 @@ static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req)
 {
        int ret = 1;
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "client %p req %p\n", client, req);
+       p9_debug(P9_DEBUG_TRANS, "client %p req %p\n", client, req);
 
        spin_lock(&client->lock);
 
@@ -726,8 +727,8 @@ static int parse_opts(char *params, struct p9_fd_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;
@@ -741,8 +742,8 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)
                if (token != Opt_err) {
                        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;
                        }
                }
@@ -801,7 +802,8 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)
        csocket->sk->sk_allocation = GFP_NOIO;
        fd = sock_map_fd(csocket, 0);
        if (fd < 0) {
-               P9_EPRINTK(KERN_ERR, "p9_socket_open: failed to map fd\n");
+               pr_err("%s (%d): failed to map fd\n",
+                      __func__, task_pid_nr(current));
                sock_release(csocket);
                kfree(p);
                return fd;
@@ -837,8 +839,8 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket)
 
 static void p9_conn_destroy(struct p9_conn *m)
 {
-       P9_DPRINTK(P9_DEBUG_TRANS, "mux %p prev %p next %p\n", m,
-               m->mux_list.prev, m->mux_list.next);
+       p9_debug(P9_DEBUG_TRANS, "mux %p prev %p next %p\n",
+                m, m->mux_list.prev, m->mux_list.next);
 
        p9_mux_poll_stop(m);
        cancel_work_sync(&m->rq);
@@ -919,7 +921,8 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)
        err = __sock_create(read_pnet(&current->nsproxy->net_ns), PF_INET,
                            SOCK_STREAM, IPPROTO_TCP, &csocket, 1);
        if (err) {
-               P9_EPRINTK(KERN_ERR, "p9_trans_tcp: problem creating socket\n");
+               pr_err("%s (%d): problem creating socket\n",
+                      __func__, task_pid_nr(current));
                return err;
        }
 
@@ -927,9 +930,8 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)
                                    (struct sockaddr *)&sin_server,
                                    sizeof(struct sockaddr_in), 0);
        if (err < 0) {
-               P9_EPRINTK(KERN_ERR,
-                       "p9_trans_tcp: problem connecting socket to %s\n",
-                       addr);
+               pr_err("%s (%d): problem connecting socket to %s\n",
+                      __func__, task_pid_nr(current), addr);
                sock_release(csocket);
                return err;
        }
@@ -947,8 +949,8 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)
        csocket = NULL;
 
        if (strlen(addr) >= UNIX_PATH_MAX) {
-               P9_EPRINTK(KERN_ERR, "p9_trans_unix: address too long: %s\n",
-                       addr);
+               pr_err("%s (%d): address too long: %s\n",
+                      __func__, task_pid_nr(current), addr);
                return -ENAMETOOLONG;
        }
 
@@ -957,15 +959,16 @@ p9_fd_create_unix(struct p9_client *client, const char *addr, char *args)
        err = __sock_create(read_pnet(&current->nsproxy->net_ns), PF_UNIX,
                            SOCK_STREAM, 0, &csocket, 1);
        if (err < 0) {
-               P9_EPRINTK(KERN_ERR, "p9_trans_unix: problem creating socket\n");
+               pr_err("%s (%d): problem creating socket\n",
+                      __func__, task_pid_nr(current));
+
                return err;
        }
        err = csocket->ops->connect(csocket, (struct sockaddr *)&sun_server,
                        sizeof(struct sockaddr_un) - 1, 0);
        if (err < 0) {
-               P9_EPRINTK(KERN_ERR,
-                       "p9_trans_unix: problem connecting socket: %s: %d\n",
-                       addr, err);
+               pr_err("%s (%d): problem connecting socket: %s: %d\n",
+                      __func__, task_pid_nr(current), addr, err);
                sock_release(csocket);
                return err;
        }
@@ -983,7 +986,7 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args)
        parse_opts(args, &opts);
 
        if (opts.rfd == ~0 || opts.wfd == ~0) {
-               printk(KERN_ERR "v9fs: Insufficient options for proto=fd\n");
+               pr_err("Insufficient options for proto=fd\n");
                return -ENOPROTOOPT;
        }
 
@@ -1050,7 +1053,7 @@ static void p9_poll_workfn(struct work_struct *work)
 {
        unsigned long flags;
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "start %p\n", current);
+       p9_debug(P9_DEBUG_TRANS, "start %p\n", current);
 
        spin_lock_irqsave(&p9_poll_lock, flags);
        while (!list_empty(&p9_poll_pending_list)) {
@@ -1066,7 +1069,7 @@ static void p9_poll_workfn(struct work_struct *work)
        }
        spin_unlock_irqrestore(&p9_poll_lock, flags);
 
-       P9_DPRINTK(P9_DEBUG_TRANS, "finish\n");
+       p9_debug(P9_DEBUG_TRANS, "finish\n");
 }
 
 int p9_trans_fd_init(void)