summaryrefslogtreecommitdiff
path: root/fs/dlm/ast.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 10:55:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 10:55:11 -0700
commit99f4065bac7b8c3f829334b4218a5c2e68cbe440 (patch)
treea7a675dc9cdc386abad4c7ce27ef5a8b59e18507 /fs/dlm/ast.h
parentf539abece1b7e36fae6add4f9ea29203d40badcb (diff)
parente43f055a953721ed1787a039ab5e720755596ea2 (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: use alloc_workqueue function dlm: increase default hash table sizes dlm: record full callback state
Diffstat (limited to 'fs/dlm/ast.h')
-rw-r--r--fs/dlm/ast.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/dlm/ast.h b/fs/dlm/ast.h
index bcb1aaba519d..8aa89c9b5611 100644
--- a/fs/dlm/ast.h
+++ b/fs/dlm/ast.h
@@ -13,8 +13,13 @@
#ifndef __ASTD_DOT_H__
#define __ASTD_DOT_H__
-void dlm_add_ast(struct dlm_lkb *lkb, int type, int mode);
void dlm_del_ast(struct dlm_lkb *lkb);
+int dlm_add_lkb_callback(struct dlm_lkb *lkb, uint32_t flags, int mode,
+ int status, uint32_t sbflags, uint64_t seq);
+int dlm_rem_lkb_callback(struct dlm_ls *ls, struct dlm_lkb *lkb,
+ struct dlm_callback *cb, int *resid);
+void dlm_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode, int status,
+ uint32_t sbflags);
void dlm_astd_wake(void);
int dlm_astd_start(void);