diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:17:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:17:12 -0700 |
| commit | c53567ad4528b6efefc3fc22a354d20f6226a098 (patch) | |
| tree | faa289a41715e0a9a174623a76c7d52b10d4a6df /include/linux | |
| parent | 4ddbac98980fe0a42cf57af5d1032e024aced6a1 (diff) | |
| parent | 748285ccf7ea76d3d76d0d5f2945ad6fb91f5329 (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 more NOFS allocation
dlm: connect to nodes earlier
dlm: fix use count with multiple joins
dlm: Make name input parameter of {,dlm_}new_lockspace() const
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dlm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h index b9cd38603fd..0b3518c4235 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h @@ -81,8 +81,8 @@ struct dlm_lksb { * the cluster, the calling node joins it. */ -int dlm_new_lockspace(char *name, int namelen, dlm_lockspace_t **lockspace, - uint32_t flags, int lvblen); +int dlm_new_lockspace(const char *name, int namelen, + dlm_lockspace_t **lockspace, uint32_t flags, int lvblen); /* * dlm_release_lockspace |