diff options
| author | David Teigland <teigland@redhat.com> | 2011-03-28 21:17:26 +0200 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2011-04-01 21:19:06 +0200 |
| commit | c6ff669bac5c409f4cb74366248f51b73f7d6feb (patch) | |
| tree | 14c4b7dc943a7dde8fd6d80bc9d149dadc0d59b8 /fs/dlm/lockspace.c | |
| parent | dlm: Remove superfluous call to recalc_sigpending() (diff) | |
| download | linux-c6ff669bac5c409f4cb74366248f51b73f7d6feb.tar.xz linux-c6ff669bac5c409f4cb74366248f51b73f7d6feb.zip | |
dlm: delayed reply message warning
Add an option (disabled by default) to print a warning message
when a lock has been waiting a configurable amount of time for
a reply message from another node. This is mainly for debugging.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/lockspace.c')
| -rw-r--r-- | fs/dlm/lockspace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index f994a7dfda85..14cbf4099753 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -243,7 +243,6 @@ static struct dlm_ls *find_ls_to_scan(void) static int dlm_scand(void *data) { struct dlm_ls *ls; - int timeout_jiffies = dlm_config.ci_scan_secs * HZ; while (!kthread_should_stop()) { ls = find_ls_to_scan(); @@ -252,13 +251,14 @@ static int dlm_scand(void *data) ls->ls_scan_time = jiffies; dlm_scan_rsbs(ls); dlm_scan_timeout(ls); + dlm_scan_waiters(ls); dlm_unlock_recovery(ls); } else { ls->ls_scan_time += HZ; } - } else { - schedule_timeout_interruptible(timeout_jiffies); + continue; } + schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ); } return 0; } |