btrfs: fix race between quota disable and quota assign ioctls

[platform/kernel/linux-rpi.git] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 1a45584..9599afd 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -55,7 +55,7 @@ static void rfc2863_policy(struct net_device *dev)
        if (operstate == dev->operstate)
                return;
 
-       write_lock_bh(&dev_base_lock);
+       write_lock(&dev_base_lock);
 
        switch(dev->link_mode) {
        case IF_LINK_MODE_TESTING:
@@ -74,7 +74,7 @@ static void rfc2863_policy(struct net_device *dev)
 
        dev->operstate = operstate;
 
-       write_unlock_bh(&dev_base_lock);
+       write_unlock(&dev_base_lock);
 }