diff --git a/[refs] b/[refs] index 7653b5ce5bdb..82da52f595ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7f52dfb4f378ea1bbfd4476f4e8ba42f5fb332c +refs/heads/master: 6bf05d03ea8d00bb53e0642f94a5a6815be2edb6 diff --git a/trunk/mm/backing-dev.c b/trunk/mm/backing-dev.c index 0b8ee66993dd..08d357522e78 100644 --- a/trunk/mm/backing-dev.c +++ b/trunk/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);