diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:44:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:44:23 -0400 |
| commit | 03b883840c630c7b571690577809754739ac773f (patch) | |
| tree | aeec0581accf5e19360205e21dd25a220b4a0e54 /fs/dlm/lock.h | |
| parent | 0d07a15bdb5a4ea6271b6e874d307c48151ef546 (diff) | |
| parent | c1c76743e98346eb052b707f0e054377a09441d1 (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: linux/{dlm,dlm_device}.h: cleanup for userspace
dlm: common max length definitions
dlm: move plock code from gfs2
dlm: recover nodes that are removed and re-added
dlm: save master info after failed no-queue request
dlm: make dlm_print_rsb() static
dlm: match signedness between dlm_config_info and cluster_set
Diffstat (limited to 'fs/dlm/lock.h')
| -rw-r--r-- | fs/dlm/lock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/dlm/lock.h b/fs/dlm/lock.h index 05d9c82e646b..88e93c80cc22 100644 --- a/fs/dlm/lock.h +++ b/fs/dlm/lock.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef __LOCK_DOT_H__ | 13 | #ifndef __LOCK_DOT_H__ |
| 14 | #define __LOCK_DOT_H__ | 14 | #define __LOCK_DOT_H__ |
| 15 | 15 | ||
| 16 | void dlm_print_rsb(struct dlm_rsb *r); | ||
| 17 | void dlm_dump_rsb(struct dlm_rsb *r); | 16 | void dlm_dump_rsb(struct dlm_rsb *r); |
| 18 | void dlm_print_lkb(struct dlm_lkb *lkb); | 17 | void dlm_print_lkb(struct dlm_lkb *lkb); |
| 19 | void dlm_receive_message_saved(struct dlm_ls *ls, struct dlm_message *ms); | 18 | void dlm_receive_message_saved(struct dlm_ls *ls, struct dlm_message *ms); |