dm: dm-zoned: use __bio_add_page for adding single metadata page

[linux-block.git] / net / bridge / br_multicast_eht.c

diff --git a/net/bridge/br_multicast_eht.c b/net/bridge/br_multicast_eht.c
index f91c071d16089aa10010a93e6736974b3d853976..c126aa4e75512f4d7f2883e64a25bc57019fb837 100644 (file)
--- a/net/bridge/br_multicast_eht.c
+++ b/net/bridge/br_multicast_eht.c
@@ -142,7 +142,7 @@ static void br_multicast_destroy_eht_set_entry(struct net_bridge_mcast_gc *gc)
        set_h = container_of(gc, struct net_bridge_group_eht_set_entry, mcast_gc);
        WARN_ON(!RB_EMPTY_NODE(&set_h->rb_node));
 
-       del_timer_sync(&set_h->timer);
+       timer_shutdown_sync(&set_h->timer);
        kfree(set_h);
 }
 
@@ -154,7 +154,7 @@ static void br_multicast_destroy_eht_set(struct net_bridge_mcast_gc *gc)
        WARN_ON(!RB_EMPTY_NODE(&eht_set->rb_node));
        WARN_ON(!RB_EMPTY_ROOT(&eht_set->entry_tree));
 
-       del_timer_sync(&eht_set->timer);
+       timer_shutdown_sync(&eht_set->timer);
        kfree(eht_set);
 }