git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
ocfs2
/
dlm
/
dlmconvert.c
diff --git
a/fs/ocfs2/dlm/dlmconvert.c
b/fs/ocfs2/dlm/dlmconvert.c
index
8285228
..
f66e2d8
100644
(file)
--- a/
fs/ocfs2/dlm/dlmconvert.c
+++ b/
fs/ocfs2/dlm/dlmconvert.c
@@
-284,10
+284,8
@@
enum dlm_status dlmconvert_remote(struct dlm_ctxt *dlm,
if (lock->ml.convert_type != LKM_IVMODE) {
__dlm_print_one_lock_resource(res);
mlog(ML_ERROR, "converting a remote lock that is already "
if (lock->ml.convert_type != LKM_IVMODE) {
__dlm_print_one_lock_resource(res);
mlog(ML_ERROR, "converting a remote lock that is already "
- "converting! (cookie=%u:%llu, conv=%d)\n",
- dlm_get_lock_cookie_node(lock->ml.cookie),
- dlm_get_lock_cookie_seq(lock->ml.cookie),
- lock->ml.convert_type);
+ "converting! (cookie=%"MLFu64", conv=%d)\n",
+ lock->ml.cookie, lock->ml.convert_type);
status = DLM_DENIED;
goto bail;
}
status = DLM_DENIED;
goto bail;
}
@@
-515,9
+513,8
@@
int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data)
leave:
if (!lock)
mlog(ML_ERROR, "did not find lock to convert on grant queue! "
leave:
if (!lock)
mlog(ML_ERROR, "did not find lock to convert on grant queue! "
- "cookie=%u:%llu\n",
- dlm_get_lock_cookie_node(cnv->cookie),
- dlm_get_lock_cookie_seq(cnv->cookie));
+ "cookie=%"MLFu64"\n",
+ cnv->cookie);
else
dlm_lock_put(lock);
else
dlm_lock_put(lock);