projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[powerpc.git]
/
fs
/
ocfs2
/
dlm
/
dlmcommon.h
diff --git
a/fs/ocfs2/dlm/dlmcommon.h
b/fs/ocfs2/dlm/dlmcommon.h
index
14530ee
..
fa96818
100644
(file)
--- a/
fs/ocfs2/dlm/dlmcommon.h
+++ b/
fs/ocfs2/dlm/dlmcommon.h
@@
-747,6
+747,7
@@
void dlm_change_lockres_owner(struct dlm_ctxt *dlm,
u8 owner);
struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,
const char *lockid,
+ int namelen,
int flags);
struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm,
const char *name,