Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[firefly-linux-kernel-4.4.55.git] / mm / backing-dev.c

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 0b8ee66993ddafeb3585a1bf231324ca7c9d0705..08d357522e784c602205a988687eddbeb0f72c10 100644 (file)
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -415,7 +415,8 @@ static int bdi_forker_thread(void *ptr)
                                break;
                        }
 
-                       spin_lock_bh(&bdi->wb_lock);
+                       spin_lock(&bdi->wb_lock);
+
                        /*
                         * If there is no work to do and the bdi thread was
                         * inactive long enough - kill it. The wb_lock is taken
@@ -432,7 +433,7 @@ static int bdi_forker_thread(void *ptr)
                                action = KILL_THREAD;
                                break;
                        }
-                       spin_unlock_bh(&bdi->wb_lock);
+                       spin_unlock(&bdi->wb_lock);
                }
                spin_unlock_bh(&bdi_lock);