Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[pandora-kernel.git] / net / rds / ib_recv.c

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 37dab28..e29e0ca 100644 (file)
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -282,6 +282,7 @@ static struct rds_page_frag *rds_ib_refill_one_frag(struct rds_ib_connection *ic
                if (!frag)
                        return NULL;
 
+               sg_init_table(&frag->f_sg, 1);
                ret = rds_page_remainder_alloc(&frag->f_sg,
                                               RDS_FRAG_SIZE, page_mask);
                if (ret) {
@@ -965,8 +966,9 @@ static inline void rds_poll_cq(struct rds_ib_connection *ic,
        struct rds_ib_recv_work *recv;
 
        while (ib_poll_cq(ic->i_recv_cq, 1, &wc) > 0) {
-               rdsdebug("wc wr_id 0x%llx status %u byte_len %u imm_data %u\n",
-                        (unsigned long long)wc.wr_id, wc.status, wc.byte_len,
+               rdsdebug("wc wr_id 0x%llx status %u (%s) byte_len %u imm_data %u\n",
+                        (unsigned long long)wc.wr_id, wc.status,
+                        rds_ib_wc_status_str(wc.status), wc.byte_len,
                         be32_to_cpu(wc.ex.imm_data));
                rds_ib_stats_inc(s_ib_rx_cq_event);
 
@@ -984,10 +986,11 @@ static inline void rds_poll_cq(struct rds_ib_connection *ic,
                } else {
                        /* We expect errors as the qp is drained during shutdown */
                        if (rds_conn_up(conn) || rds_conn_connecting(conn))
-                               rds_ib_conn_error(conn, "recv completion on "
-                                                 "%pI4 had status %u, disconnecting and "
+                               rds_ib_conn_error(conn, "recv completion on %pI4 had "
+                                                 "status %u (%s), disconnecting and "
                                                  "reconnecting\n", &conn->c_faddr,
-                                                 wc.status);
+                                                 wc.status,
+                                                 rds_ib_wc_status_str(wc.status));
                }
 
                /*
@@ -1040,7 +1043,7 @@ int rds_ib_recv(struct rds_connection *conn)
        return ret;
 }
 
-int __init rds_ib_recv_init(void)
+int rds_ib_recv_init(void)
 {
        struct sysinfo si;
        int ret = -ENOMEM;