diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 20:55:11 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 20:55:11 +0300 |
| commit | 99f4065bac7b8c3f829334b4218a5c2e68cbe440 (patch) | |
| tree | a7a675dc9cdc386abad4c7ce27ef5a8b59e18507 /fs/dlm/user.h | |
| parent | f539abece1b7e36fae6add4f9ea29203d40badcb (diff) | |
| parent | e43f055a953721ed1787a039ab5e720755596ea2 (diff) | |
| download | linux-99f4065bac7b8c3f829334b4218a5c2e68cbe440.tar.xz | |
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/user.h')
| -rw-r--r-- | fs/dlm/user.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/dlm/user.h b/fs/dlm/user.h index f196091dd7ff..00499ab8835f 100644 --- a/fs/dlm/user.h +++ b/fs/dlm/user.h @@ -9,7 +9,8 @@ #ifndef __USER_DOT_H__ #define __USER_DOT_H__ -void dlm_user_add_ast(struct dlm_lkb *lkb, int type, int mode); +void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode, + int status, uint32_t sbflags, uint64_t seq); int dlm_user_init(void); void dlm_user_exit(void); int dlm_device_deregister(struct dlm_ls *ls); |