git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[sfrench/cifs-2.6.git]
/
fs
/
ocfs2
/
dlm
/
dlmconvert.c
diff --git
a/fs/ocfs2/dlm/dlmconvert.c
b/fs/ocfs2/dlm/dlmconvert.c
index ecb4d997221e6460b33efa9e2747bda6b78fa3bb..75997b4deaf3ff9fafd4fcf25293c9312fb17fc8 100644
(file)
--- a/
fs/ocfs2/dlm/dlmconvert.c
+++ b/
fs/ocfs2/dlm/dlmconvert.c
@@
-487,7
+487,7
@@
int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data,
"cookie=%u:%llu\n",
dlm_get_lock_cookie_node(be64_to_cpu(cnv->cookie)),
dlm_get_lock_cookie_seq(be64_to_cpu(cnv->cookie)));
-
__
dlm_print_one_lock_resource(res);
+ dlm_print_one_lock_resource(res);
goto leave;
}