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/lock.h | |
| parent | b0ca118dbacbc6c35e15f216e25e95cca7aedf5b (diff) | |
| parent | 901025d2f3194b4868980c8ba80df4cc0aa1282c (diff) | |
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/lock.h')
| -rw-r--r-- | fs/dlm/lock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 88e93c80cc2..265017a7c3e 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h @@ -24,6 +24,7 @@ int dlm_put_lkb(struct dlm_lkb *lkb); void dlm_scan_rsbs(struct dlm_ls *ls); int dlm_lock_recovery_try(struct dlm_ls *ls); void dlm_unlock_recovery(struct dlm_ls *ls); +void dlm_scan_waiters(struct dlm_ls *ls); void dlm_scan_timeout(struct dlm_ls *ls); void dlm_adjust_timeouts(struct dlm_ls *ls); |