libfc: Debug code fixes

The second argument of fc_lport_error() may be a valid frame pointer.
Hence only print it as an error code if it really is an error code.

Debug statements must end in a newline. Add one where it is missing.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index b233a2dea122057d46853ef33f5515a93c99fe12..cb2b900c011d6b481fd8360e27e0543e2289ea40 100644 (file)
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -1659,7 +1659,7 @@ static void fc_exch_recv_bls(struct fc_exch_mgr *mp, struct fc_frame *fp)
                        break;
                default:
                        if (ep)
-                               FC_EXCH_DBG(ep, "BLS rctl %x - %s received",
+                               FC_EXCH_DBG(ep, "BLS rctl %x - %s received\n",
                                            fh->fh_r_ctl,
                                            fc_exch_rctl_name(fh->fh_r_ctl));
                        break;
@@ -1953,13 +1953,13 @@ static void fc_exch_rrq_resp(struct fc_seq *sp, struct fc_frame *fp, void *arg)
 
        switch (op) {
        case ELS_LS_RJT:
-               FC_EXCH_DBG(aborted_ep, "LS_RJT for RRQ");
+               FC_EXCH_DBG(aborted_ep, "LS_RJT for RRQ\n");
                /* fall through */
        case ELS_LS_ACC:
                goto cleanup;
        default:
-               FC_EXCH_DBG(aborted_ep, "unexpected response op %x "
-                           "for RRQ", op);
+               FC_EXCH_DBG(aborted_ep, "unexpected response op %x for RRQ\n",
+                           op);
                return;
        }
 

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index a32f3141f3f96c046e20dd20068883f1844ada03..e01a29863c384ca3c0ad1189d5b757b72f8fb660 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1088,7 +1088,7 @@ static void fc_lport_error(struct fc_lport *lport, struct fc_frame *fp)
 {
        unsigned long delay = 0;
        FC_LPORT_DBG(lport, "Error %ld in state %s, retries %d\n",
-                    PTR_ERR(fp), fc_lport_state(lport),
+                    IS_ERR(fp) ? -PTR_ERR(fp) : 0, fc_lport_state(lport),
                     lport->retry_count);
 
        if (PTR_ERR(fp) == -FC_EX_CLOSED)