diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:04:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 15:04:00 -0700 |
| commit | df3256f9ab7ae2127144de5ba2abca332278a42d (patch) | |
| tree | c2cbdca425b745894a23f8cf7d7c91effcd7478c /fs/dlm/lockspace.c | |
| parent | b0ca118dbacbc6c35e15f216e25e95cca7aedf5b (diff) | |
| parent | 901025d2f3194b4868980c8ba80df4cc0aa1282c (diff) | |
| download | linux-df3256f9ab7ae2127144de5ba2abca332278a42d.tar.gz linux-df3256f9ab7ae2127144de5ba2abca332278a42d.tar.bz2 linux-df3256f9ab7ae2127144de5ba2abca332278a42d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: make plock operation killable
dlm: remove shared message stub for recovery
dlm: delayed reply message warning
dlm: Remove superfluous call to recalc_sigpending()
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; } |