Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b20d9bfd authored by Bart Van Assche's avatar Bart Van Assche Committed by Robert Love
Browse files

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: default avatarBart Van Assche <bvanassche@acm.org>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
parent c1d45424

drivers/scsi/libfc/fc_exch.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/scsi/libfc/fc_lport.c

+1 −1
Original line number Diff line number Diff line
@@ -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)