Commit-ID: 013ff4a6e7bc5aa64b0b937daae0244e3c93e49c Gitweb: https://git.kernel.org/tip/013ff4a6e7bc5aa64b0b937daae0244e3c93e49c Author: Lance Roy <[email protected]> AuthorDate: Thu, 4 Oct 2018 23:45:41 -0700 Committer: Paul E. McKenney <[email protected]> CommitDate: Mon, 12 Nov 2018 09:06:22 -0800
sfc: Replace spin_is_locked() with lockdep lockdep_assert_held() is better suited to checking locking requirements, since it only checks if the current thread holds the lock regardless of whether someone else does. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy <[email protected]> Cc: Solarflare linux maintainers <[email protected]> Cc: Bert Kenward <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> Acked-by: Edward Cree <[email protected]> --- drivers/net/ethernet/sfc/efx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 98fe7e762e17..3643015a55cf 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -3167,7 +3167,7 @@ struct hlist_head *efx_rps_hash_bucket(struct efx_nic *efx, { u32 hash = efx_filter_spec_hash(spec); - WARN_ON(!spin_is_locked(&efx->rps_hash_lock)); + lockdep_assert_held(&efx->rps_hash_lock); if (!efx->rps_hash_table) return NULL; return &efx->rps_hash_table[hash % EFX_ARFS_HASH_TABLE_SIZE];
