瀏覽代碼

watchdog: fix double lock in watchdog_nmi_enable_all

Commit ab992dc38f9a ("watchdog: Fix merge 'conflict'") has introduced an
obvious deadlock because of a typo.  watchdog_proc_mutex should be
unlocked on exit.

Thanks to Miroslav Benes who was staring at the code with me and noticed
this.

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Duh-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Michal Hocko 10 年之前
父節點
當前提交
1173ff09b9
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      kernel/watchdog.c

+ 1 - 1
kernel/watchdog.c

@@ -621,7 +621,7 @@ void watchdog_nmi_enable_all(void)
 	put_online_cpus();
 	put_online_cpus();
 
 
 unlock:
 unlock:
-	mutex_lock(&watchdog_proc_mutex);
+	mutex_unlock(&watchdog_proc_mutex);
 }
 }
 
 
 void watchdog_nmi_disable_all(void)
 void watchdog_nmi_disable_all(void)