Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k...

[cascardo/linux.git] / drivers / infiniband / ulp / srp / ib_srp.c

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 06d91e7..c3f654d 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -254,7 +254,8 @@ static void srp_free_iu(struct srp_host *host, struct srp_iu *iu)
 
 static void srp_qp_event(struct ib_event *event, void *context)
 {
-       pr_debug("QP event %d\n", event->event);
+       pr_debug("QP event %s (%d)\n",
+                ib_event_msg(event->event), event->event);
 }
 
 static int srp_init_qp(struct srp_target_port *target,
@@ -1922,17 +1923,18 @@ static void srp_handle_qp_err(u64 wr_id, enum ib_wc_status wc_status,
        if (ch->connected && !target->qp_in_error) {
                if (wr_id & LOCAL_INV_WR_ID_MASK) {
                        shost_printk(KERN_ERR, target->scsi_host, PFX
-                                    "LOCAL_INV failed with status %d\n",
-                                    wc_status);
+                                    "LOCAL_INV failed with status %s (%d)\n",
+                                    ib_wc_status_msg(wc_status), wc_status);
                } else if (wr_id & FAST_REG_WR_ID_MASK) {
                        shost_printk(KERN_ERR, target->scsi_host, PFX
-                                    "FAST_REG_MR failed status %d\n",
-                                    wc_status);
+                                    "FAST_REG_MR failed status %s (%d)\n",
+                                    ib_wc_status_msg(wc_status), wc_status);
                } else {
                        shost_printk(KERN_ERR, target->scsi_host,
-                                    PFX "failed %s status %d for iu %p\n",
+                                    PFX "failed %s status %s (%d) for iu %p\n",
                                     send_err ? "send" : "receive",
-                                    wc_status, (void *)(uintptr_t)wr_id);
+                                    ib_wc_status_msg(wc_status), wc_status,
+                                    (void *)(uintptr_t)wr_id);
                }
                queue_work(system_long_wq, &target->tl_err_work);
        }