git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
userdlm.h
diff --git
a/fs/ocfs2/dlm/userdlm.h
b/fs/ocfs2/dlm/userdlm.h
index
04178bc
..
c400e93
100644
(file)
--- a/
fs/ocfs2/dlm/userdlm.h
+++ b/
fs/ocfs2/dlm/userdlm.h
@@
-53,6
+53,7
@@
struct user_lock_res {
#define USER_DLM_LOCK_ID_MAX_LEN 32
char l_name[USER_DLM_LOCK_ID_MAX_LEN];
+ int l_namelen;
int l_level;
unsigned int l_ro_holders;
unsigned int l_ex_holders;