Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932340Ab0LSV3F (ORCPT ); Sun, 19 Dec 2010 16:29:05 -0500 Received: from nm8-vm0.bullet.mail.ac4.yahoo.com ([98.139.52.230]:24360 "HELO nm8-vm0.bullet.mail.ac4.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757194Ab0LSV3E (ORCPT ); Sun, 19 Dec 2010 16:29:04 -0500 X-Yahoo-Newman-Id: 752786.91293.bm@omp1014.mail.ac4.yahoo.com X-Yahoo-SMTP: fzDSGlOswBCWnIOrNw7KwwK1j9PqyNbe5PtLKiS4dDU.UNl_t6bdEZu9tTLW X-YMail-OSG: 17J1V5wVM1mO57BDlhKs4wI8XAUjDFzRK6f0iTXaAg2FBe0 9cn8fHPVPFuLcaKP28GH7wPsvRTu5iriuGWimAtDJcDDS839mdRjxmcCh79Q QxpnW7KB_xgXjwMsfnkIvNDxL.7oEht.wIFdt_pE1gXGTfHUiyN_WfHhv.fr 4TSWYMpDjtyjvsioQzuWv7eOkgWypii1d7QO5sh8001Y9xtNLu9_63eDwh2. pgWAXqZ3TLtVTk8QCNhRkzPCMGBLWLJsJr_mlksGwA0F.ZAIx5uiWZaVN05r aLg6jGFAzImDqKuNdW8XgHi4SRfGejggXjgItX_eHei6PASXkOT2XCph_Zh6 BRWWac2uN7RbHSbzg0Haegl1e72Vf X-Yahoo-Newman-Property: ymail-3 From: "Nicholas A. Bellinger" To: linux-scsi , linux-kernel , James Bottomley , Jeff Garzik , Christoph Hellwig , FUJITA Tomonori , Hannes Reinecke , Mike Christie Cc: Mike Anderson , Tejun Heo , Vasu Dev , Tim Chen , Andi Kleen , Ravi Anand , Andrew Vasquez , Joe Eykholt , James Smart , Douglas Gilbert , adam radford , Kashyap Desai , MPTFusionLinux , Nicholas Bellinger Subject: [PATCH 01/12] libiscsi: Convert to host_lock less w/ interrupts disabled internally Date: Sun, 19 Dec 2010 13:21:56 -0800 Message-Id: <1292793727-31957-2-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1292793727-31957-1-git-send-email-nab@linux-iscsi.org> References: <1292793727-31957-1-git-send-email-nab@linux-iscsi.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2327 Lines: 76 From: Nicholas Bellinger This patch changes iscsi_queuecommand_lck() to a host_lock less iscsi_queuecommand() that will internally disable interrupts using session->lock and drop the now legacy host_lock unlock. Signed-off-by: Nicholas A. Bellinger --- drivers/scsi/libiscsi.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index c15fde8..5535782 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1599,7 +1599,7 @@ enum { FAILURE_SESSION_NOT_READY, }; -static int iscsi_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *)) +int iscsi_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *sc) { struct iscsi_cls_session *cls_session; struct Scsi_Host *host; @@ -1609,13 +1609,11 @@ static int iscsi_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi struct iscsi_conn *conn; struct iscsi_task *task = NULL; - sc->scsi_done = done; sc->result = 0; sc->SCp.ptr = NULL; host = sc->device->host; ihost = shost_priv(host); - spin_unlock(host->host_lock); cls_session = starget_to_session(scsi_target(sc->device)); session = cls_session->dd_data; @@ -1706,7 +1704,6 @@ static int iscsi_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi session->queued_cmdsn++; spin_unlock(&session->lock); - spin_lock(host->host_lock); return 0; prepd_reject: @@ -1716,7 +1713,6 @@ reject: spin_unlock(&session->lock); ISCSI_DBG_SESSION(session, "cmd 0x%x rejected (%d)\n", sc->cmnd[0], reason); - spin_lock(host->host_lock); return SCSI_MLQUEUE_TARGET_BUSY; prepd_fault: @@ -1732,12 +1728,10 @@ fault: scsi_out(sc)->resid = scsi_out(sc)->length; scsi_in(sc)->resid = scsi_in(sc)->length; } - done(sc); - spin_lock(host->host_lock); + sc->scsi_done(sc); return 0; } -DEF_SCSI_QCMD(iscsi_queuecommand) EXPORT_SYMBOL_GPL(iscsi_queuecommand); int iscsi_change_queue_depth(struct scsi_device *sdev, int depth, int reason) -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/