OSDN Git Service

i40e: Replace spin_is_locked() with lockdep
authorLance Roy <ldr709@gmail.com>
Wed, 3 Oct 2018 05:38:50 +0000 (22:38 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 14 Nov 2018 18:56:33 +0000 (10:56 -0800)
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>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 21c2688..7e4c072 100644 (file)
@@ -1493,8 +1493,7 @@ int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr)
        bool found = false;
        int bkt;
 
-       WARN(!spin_is_locked(&vsi->mac_filter_hash_lock),
-            "Missing mac_filter_hash_lock\n");
+       lockdep_assert_held(&vsi->mac_filter_hash_lock);
        hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) {
                if (ether_addr_equal(macaddr, f->macaddr)) {
                        __i40e_del_filter(vsi, f);