[DLM] block scand during recovery [1/6]

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / dlm / lockspace.c

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index a677b2a..414a108 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -234,8 +234,12 @@ static int dlm_scand(void *data)
        struct dlm_ls *ls;
 
        while (!kthread_should_stop()) {
-               list_for_each_entry(ls, &lslist, ls_list)
-                       dlm_scan_rsbs(ls);
+               list_for_each_entry(ls, &lslist, ls_list) {
+                       if (dlm_lock_recovery_try(ls)) {
+                               dlm_scan_rsbs(ls);
+                               dlm_unlock_recovery(ls);
+                       }
+               }
                schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);
        }
        return 0;