]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
scsi: target: core: Fix warning on realtime kernels
authorMaurizio Lombardi <mlombard@redhat.com>
Mon, 31 May 2021 12:13:26 +0000 (14:13 +0200)
committerSasha Levin <sashal@kernel.org>
Wed, 30 Jun 2021 12:48:11 +0000 (08:48 -0400)
[ Upstream commit 515da6f4295c2c42b8c54572cce3d2dd1167c41e ]

On realtime kernels, spin_lock_irq*(spinlock_t) do not disable the
interrupts, a call to irqs_disabled() will return false thus firing a
warning in __transport_wait_for_tasks().

Remove the warning and also replace assert_spin_locked() with
lockdep_assert_held()

Link: https://lore.kernel.org/r/20210531121326.3649-1-mlombard@redhat.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/target/target_core_transport.c

index bdada97cd4fe2b82e6fba4e13d0c526e108e8473..9c60a090cfd171950d1feef0b5a22110b63fbf8c 100644 (file)
@@ -2982,9 +2982,7 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
        __releases(&cmd->t_state_lock)
        __acquires(&cmd->t_state_lock)
 {
-
-       assert_spin_locked(&cmd->t_state_lock);
-       WARN_ON_ONCE(!irqs_disabled());
+       lockdep_assert_held(&cmd->t_state_lock);
 
        if (fabric_stop)
                cmd->transport_state |= CMD_T_FABRIC_STOP;