diff options
| author | Alex Elder <aelder@sgi.com> | 2011-08-08 07:06:24 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-08-08 07:06:24 -0500 |
| commit | 2ddb4e94065470828e131351566102274ea9e83f (patch) | |
| tree | 3eb237d28e10d7735d57c051880e8173113acef8 /fs/dlm/memory.h | |
| parent | c35a549c8b9e85bdff7e531a410d10e36b4b4f32 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
| download | op-kernel-dev-2ddb4e94065470828e131351566102274ea9e83f.zip op-kernel-dev-2ddb4e94065470828e131351566102274ea9e83f.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'fs/dlm/memory.h')
| -rw-r--r-- | fs/dlm/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/memory.h b/fs/dlm/memory.h index 485fb29..177c11c 100644 --- a/fs/dlm/memory.h +++ b/fs/dlm/memory.h @@ -16,7 +16,7 @@ int dlm_memory_init(void); void dlm_memory_exit(void); -struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls, int namelen); +struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls); void dlm_free_rsb(struct dlm_rsb *r); struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls); void dlm_free_lkb(struct dlm_lkb *l); |
