Revert "Bluetooth: Store advertising handle so it can be re-enabled"

[platform/kernel/linux-rpi.git] / fs / dcache.c

diff --git a/fs/dcache.c b/fs/dcache.c
index 25ac74d..9ae808f 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -787,12 +787,12 @@ static inline bool fast_dput(struct dentry *dentry)
         */
        if (unlikely(ret < 0)) {
                spin_lock(&dentry->d_lock);
-               if (dentry->d_lockref.count > 1) {
-                       dentry->d_lockref.count--;
+               if (WARN_ON_ONCE(dentry->d_lockref.count <= 0)) {
                        spin_unlock(&dentry->d_lock);
                        return true;
                }
-               return false;
+               dentry->d_lockref.count--;
+               goto locked;
        }
 
        /*
@@ -850,6 +850,7 @@ static inline bool fast_dput(struct dentry *dentry)
         * else could have killed it and marked it dead. Either way, we
         * don't need to do anything else.
         */
+locked:
        if (dentry->d_lockref.count) {
                spin_unlock(&dentry->d_lock);
                return true;