public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
To: Mike Christie <michaelc@cs.wisc.edu>
Cc: Linux SCSI Mailing List <linux-scsi@vger.kernel.org>,
	James Bottomley <James.Bottomley@HansenPartnership.com>,
	Seokmann Ju <seokmann.ju@qlogic.com>,
	James Smart <james.smart@emulex.com>,
	Brian King <brking@linux.vnet.ibm.com>
Subject: [PATCH] fc_transport: remove explicit calls to scsi_target_unblock() from terminate_rport_io() callbacks.
Date: Fri, 11 Jul 2008 11:17:48 -0700	[thread overview]
Message-ID: <20080711181748.GC55164@plap4-2.local> (raw)
In-Reply-To: <48779934.8020000@cs.wisc.edu>

Recent work in the transport
(http://marc.info/?l=linux-scsi&m=121263015008613&w=2) centralizes an
'unblock' operation on an rports scsi-target after the
terminate_rport_io() callback.

Cc: James Smart <james.smart@emulex.com>
Cc: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
---
	On Fri, 11 Jul 2008, Mike Christie wrote:

	> Andrew Vasquez wrote:
	>> +
	>> +static void
	>> +qla2x00_terminate_rport_io(struct fc_rport *rport)
	>> +{
	>> +	fc_port_t *fcport = *(fc_port_t **)rport->dd_data;
	>> +
	>> +	qla2x00_abort_fcport_cmds(fcport);
	>> +	scsi_target_unblock(&rport->dev);
	>
	> I sent a patch so the unblock is always done by the fc class.
	> http://marc.info/?l=linux-scsi&m=121263015008613&w=2
	>
	> Could we do that instead so qlogic and emulex and all other drivers behave 
	> the same?

	And here's a patch to drop the explicit calls to scsi_target_unblock()
	from current fc-tranport consumers with a terminate_rport_io()
	callback.

	BTW: I don't see the patchset in scsi-misc-2.6.git.

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index eb702b9..4c6c6a9 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2002,7 +2002,6 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport)
 	} else
 		ibmvfc_issue_fc_host_lip(shost);
 
-	scsi_target_unblock(&rport->dev);
 	LEAVE;
 }
 
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index a98d11b..f6f50a7 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -89,12 +89,6 @@ lpfc_terminate_rport_io(struct fc_rport *rport)
 			ndlp->nlp_sid, 0, LPFC_CTX_TGT);
 	}
 
-	/*
-	 * A device is normally blocked for rediscovery and unblocked when
-	 * devloss timeout happens.  In case a vport is removed or driver
-	 * unloaded before devloss timeout happens, we need to unblock here.
-	 */
-	scsi_target_unblock(&rport->dev);
 	return;
 }
 

  parent reply	other threads:[~2008-07-11 18:17 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-10 23:54 [PATCH 0/18] qla2xxx: updates for 2.6.27 [8.02.01-k5] Andrew Vasquez
2008-07-10 23:55 ` [PATCH 01/18] qla2xxx: Correct locking during NVRAM manipulation Andrew Vasquez
2008-07-10 23:55 ` [PATCH 02/18] qla2xxx: Add dev_loss_tmo_callbk/terminate_rport_io callback support Andrew Vasquez
2008-07-11 17:32   ` Mike Christie
2008-07-11 18:04     ` [RESEND PATCH " Andrew Vasquez
2008-07-11 18:21       ` Mike Christie
2008-07-11 19:16         ` Andrew Vasquez
2008-07-11 18:17     ` Andrew Vasquez [this message]
2008-07-11 17:37   ` [PATCH " Mike Christie
2008-07-11 17:49     ` Andrew Vasquez
2008-07-10 23:55 ` [PATCH 03/18] qla2xxx: Set an rport's dev_loss_tmo value in a consistent manner Andrew Vasquez
2008-07-10 23:55 ` [PATCH 04/18] qla2xxx: Track total number of ISP aborts Andrew Vasquez
2008-07-10 23:55 ` [PATCH 05/18] qla2xxx: Add LIP count to FC-transport statistics Andrew Vasquez
2008-07-10 23:55 ` [PATCH 06/18] qla2xxx: Cleanup NPIV related functions Andrew Vasquez
2008-07-10 23:55 ` [PATCH 07/18] qla2xxx: Allow the user the option of disabling iIDMA Andrew Vasquez
2008-07-10 23:55 ` [PATCH 08/18] qla2xxx: Retrieve board serial-number and description from VPD Andrew Vasquez
2008-07-10 23:55 ` [PATCH 09/18] qla2xxx: Swap enablement order of EFT and FCE Andrew Vasquez
2008-07-10 23:55 ` [PATCH 10/18] qla2xxx: Always aquire the parent's hardware_lock Andrew Vasquez
2008-07-10 23:55 ` [PATCH 11/18] qla2xxx: Correct fcport state-management during loss Andrew Vasquez
2008-07-10 23:55 ` [PATCH 12/18] qla2xxx: Correct vport management of MBA_PORT_UPDATE Andrew Vasquez
2008-07-10 23:55 ` [PATCH 13/18] qla2xxx: Correct rport/fcport visibility-state handling during loop-resync Andrew Vasquez
2008-07-10 23:55 ` [PATCH 14/18] qla2xxx: Skip FDMI registration on ISP21xx/22xx parts Andrew Vasquez
2008-07-10 23:56 ` [PATCH 15/18] qla2xxx: Correct overflow during dump-processing on large-memory ISP23xx parts Andrew Vasquez
2008-07-10 23:56 ` [PATCH 16/18] qla2xxx: Verify the RISC is not in ROM code if firmware-load is disabled Andrew Vasquez
2008-07-10 23:56 ` [PATCH 17/18] qla2xxx: Don't hardcode fw_transfer_size for ISP2[45]xx parts Andrew Vasquez
2008-07-10 23:56 ` [PATCH 18/18] qla2xxx: Update version number to 8.02.01-k5 Andrew Vasquez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080711181748.GC55164@plap4-2.local \
    --to=andrew.vasquez@qlogic.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=brking@linux.vnet.ibm.com \
    --cc=james.smart@emulex.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=michaelc@cs.wisc.edu \
    --cc=seokmann.ju@qlogic.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox