mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lance Roy <ldr709@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: "Paul E. McKenney" <paulmck@linux.ibm.com>,
	Lance Roy <ldr709@gmail.com>,
	Karan Tilak Kumar <kartilak@cisco.com>,
	Sesidhar Baddela <sebaddel@cisco.com>,
	"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	linux-scsi@vger.kernel.org
Subject: [PATCH 09/16] scsi: Replace spin_is_locked() with lockdep
Date: Tue,  2 Oct 2018 22:38:55 -0700	[thread overview]
Message-ID: <20181003053902.6910-10-ldr709@gmail.com> (raw)
In-Reply-To: <20181003053902.6910-1-ldr709@gmail.com>

lockdep_assert_held() is better suited to checking locking requirements,
since it won't get confused when someone else holds the lock. This is
also a step towards possibly removing spin_is_locked().

Signed-off-by: Lance Roy <ldr709@gmail.com>
Cc: Karan Tilak Kumar <kartilak@cisco.com>
Cc: Sesidhar Baddela <sebaddel@cisco.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>
---
 drivers/scsi/snic/snic_scsi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index d9b2e46424aa..42e485139fc9 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -2001,7 +2001,7 @@ snic_dr_finish(struct snic *snic, struct scsi_cmnd *sc)
 	}
 
 dr_failed:
-	SNIC_BUG_ON(!spin_is_locked(io_lock));
+	lockdep_assert_held(io_lock);
 	if (rqi)
 		CMD_SP(sc) = NULL;
 	spin_unlock_irqrestore(io_lock, flags);
@@ -2604,7 +2604,7 @@ snic_internal_abort_io(struct snic *snic, struct scsi_cmnd *sc, int tmf)
 	ret = SUCCESS;
 
 skip_internal_abts:
-	SNIC_BUG_ON(!spin_is_locked(io_lock));
+	lockdep_assert_held(io_lock);
 	spin_unlock_irqrestore(io_lock, flags);
 
 	return ret;
-- 
2.19.0


  parent reply	other threads:[~2018-10-03  5:41 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-03  5:38 Using lockdep instead of spin_is_locked() Lance Roy
2018-10-03  5:38 ` [PATCH 01/16] x86/PCI: Replace spin_is_locked() with lockdep Lance Roy
2018-10-03 16:00   ` Bjorn Helgaas
2018-10-04  6:50     ` Lance Roy
2018-10-03  5:38 ` [PATCH 02/16] hv_balloon: " Lance Roy
2018-10-03 13:20   ` Vitaly Kuznetsov
2018-10-03  5:38 ` [PATCH 03/16] sgi-xp: " Lance Roy
2018-10-03  5:38 ` [PATCH 04/16] i40e: " Lance Roy
2018-10-04 18:56   ` [Intel-wired-lan] " Bowers, AndrewX
2018-10-03  5:38 ` [PATCH 05/16] igbvf: " Lance Roy
2018-10-13  0:11   ` Brown, Aaron F
2018-10-03  5:38 ` [PATCH 06/16] sfc: " Lance Roy
2018-10-03  5:38 ` [PATCH 07/16] smsc: " Lance Roy
2018-10-03  5:38 ` [PATCH 08/16] wireless: " Lance Roy
2018-10-03  9:06   ` Kalle Valo
2018-10-04  6:57     ` Lance Roy
2018-10-04 10:05       ` Kalle Valo
2018-10-05  8:35   ` [PATCH 08/16] zd1211rw: " Kalle Valo
2018-10-03  5:38 ` Lance Roy [this message]
2018-10-03 13:53   ` [PATCH 09/16] scsi: " Bart Van Assche
2018-10-11  2:37   ` Martin K. Petersen
2018-10-03  5:38 ` [PATCH 10/16] userfaultfd: " Lance Roy
2018-10-03  5:38 ` [PATCH 11/16] futex: " Lance Roy
2018-10-09 11:21   ` [tip:locking/core] " tip-bot for Lance Roy
2018-10-03  5:38 ` [PATCH 12/16] locking/mutex: " Lance Roy
2018-10-09 12:18   ` Will Deacon
2018-10-09 13:36     ` Paul E. McKenney
2018-10-03  5:38 ` [PATCH 13/16] mm: " Lance Roy
2018-10-03  7:37   ` Vlastimil Babka
2018-10-03  5:39 ` [PATCH 14/16] netfilter: " Lance Roy
2018-10-03  8:29   ` Jozsef Kadlecsik
2018-10-03  5:39 ` [PATCH 15/16] apparmor: " Lance Roy
2018-10-03  5:56   ` John Johansen
2018-10-03  5:39 ` [PATCH 16/16] KVM: arm/arm64: vgic: " Lance Roy
2018-11-02 18:45   ` Christoffer Dall
2018-11-02 19:42     ` Paul E. McKenney

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=20181003053902.6910-10-ldr709@gmail.com \
    --to=ldr709@gmail.com \
    --cc=jejb@linux.vnet.ibm.com \
    --cc=kartilak@cisco.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=paulmck@linux.ibm.com \
    --cc=sebaddel@cisco.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

Powered by JetHome