diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 14:13:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-10 14:13:55 -0400 |
| commit | 13dd7f876dffb44088c5435c3df1986e33cff960 (patch) | |
| tree | c9043429452663661dc888e1cbafa87bd2a62f44 /fs/dlm/lockspace.h | |
| parent | b0af205afb111e17ac8db64c3b9c4f2c332de92a (diff) | |
| parent | 27eccf46491e1f77f9af9bbe0778122ce6882890 (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: choose better identifiers
dlm: remove bkl
dlm: fix address compare
dlm: fix locking of lockspace list in dlm_scand
dlm: detect available userspace daemon
dlm: allow multiple lockspace creates
Diffstat (limited to 'fs/dlm/lockspace.h')
| -rw-r--r-- | fs/dlm/lockspace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/lockspace.h b/fs/dlm/lockspace.h index 891eabbdd021..f879f87901f8 100644 --- a/fs/dlm/lockspace.h +++ b/fs/dlm/lockspace.h | |||
| @@ -20,6 +20,7 @@ struct dlm_ls *dlm_find_lockspace_global(uint32_t id); | |||
| 20 | struct dlm_ls *dlm_find_lockspace_local(void *id); | 20 | struct dlm_ls *dlm_find_lockspace_local(void *id); |
| 21 | struct dlm_ls *dlm_find_lockspace_device(int minor); | 21 | struct dlm_ls *dlm_find_lockspace_device(int minor); |
| 22 | void dlm_put_lockspace(struct dlm_ls *ls); | 22 | void dlm_put_lockspace(struct dlm_ls *ls); |
| 23 | void dlm_stop_lockspaces(void); | ||
| 23 | 24 | ||
| 24 | #endif /* __LOCKSPACE_DOT_H__ */ | 25 | #endif /* __LOCKSPACE_DOT_H__ */ |
| 25 | 26 | ||