Explorar o código

Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"

This reverts commit 1d7c49037b12016e7056b9f2c990380e2187e766.

Nikolay Aleksandrov has a better version of this fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller %!s(int64=10) %!d(string=hai) anos
pai
achega
7ff46e79fb
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      net/bridge/br_fdb.c

+ 2 - 2
net/bridge/br_fdb.c

@@ -569,7 +569,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
 				fdb_notify(br, fdb, RTM_NEWNEIGH);
 				fdb_notify(br, fdb, RTM_NEWNEIGH);
 		}
 		}
 	} else {
 	} else {
-		spin_lock_bh(&br->hash_lock);
+		spin_lock(&br->hash_lock);
 		if (likely(!fdb_find(head, addr, vid))) {
 		if (likely(!fdb_find(head, addr, vid))) {
 			fdb = fdb_create(head, source, addr, vid);
 			fdb = fdb_create(head, source, addr, vid);
 			if (fdb) {
 			if (fdb) {
@@ -581,7 +581,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
 		/* else  we lose race and someone else inserts
 		/* else  we lose race and someone else inserts
 		 * it first, don't bother updating
 		 * it first, don't bother updating
 		 */
 		 */
-		spin_unlock_bh(&br->hash_lock);
+		spin_unlock(&br->hash_lock);
 	}
 	}
 }
 }