Commit 28a4af1e authored Jan 28, 2011 by Hillf Danton Committed by James Bottomley Feb 12, 2011

[SCSI] libfc: Cleanup return paths in fc_rport_error_retry



This patch makes it so that we only have one call to
fc_rport_error. This patch does not completely
consolidate return statements, there is still one return
used when not calling fc_rport_error, but alternative
solutions made the code more confusing.

[ Patch modified by Robert Love ]
[ Patch title and commit message edited by Robert Love
  to make it more relevant ]

Signed-off-by: Hillf Danton <dhillf@gmail.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent fa79dbdb

drivers/scsi/libfc/fc_rport.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -575,7 +575,7 @@ static void fc_rport_error_retry(struct fc_rport_priv *rdata,

		/* make sure this isn't an FC_EX_CLOSED error, never retry those */
		if (PTR_ERR(fp) == -FC_EX_CLOSED)
		return fc_rport_error(rdata, fp);
		goto out;

		if (rdata->retries < rdata->local_port->max_rport_retry_count) {
		FC_RPORT_DBG(rdata, "Error %ld in state %s, retrying\n",
		@@ -588,7 +588,8 @@ static void fc_rport_error_retry(struct fc_rport_priv *rdata,
		return;
		}

		return fc_rport_error(rdata, fp);
		out:
		fc_rport_error(rdata, fp);
		}

		/**