projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[cascardo/linux.git]
/
fs
/
ocfs2
/
dlm
/
dlmconvert.c
diff --git
a/fs/ocfs2/dlm/dlmconvert.c
b/fs/ocfs2/dlm/dlmconvert.c
index
9f30491
..
29a886d
100644
(file)
--- a/
fs/ocfs2/dlm/dlmconvert.c
+++ b/
fs/ocfs2/dlm/dlmconvert.c
@@
-128,8
+128,8
@@
static enum dlm_status __dlmconvert_master(struct dlm_ctxt *dlm,
assert_spin_locked(&res->spinlock);
assert_spin_locked(&res->spinlock);
- mlog
_entry(
"type=%d, convert_type=%d, new convert_type=%d\n",
-
lock->ml.type, lock->ml.convert_type, type);
+ mlog
(0,
"type=%d, convert_type=%d, new convert_type=%d\n",
+ lock->ml.type, lock->ml.convert_type, type);
spin_lock(&lock->spinlock);
spin_lock(&lock->spinlock);
@@
-353,7
+353,7
@@
static enum dlm_status dlm_send_remote_convert_request(struct dlm_ctxt *dlm,
struct kvec vec[2];
size_t veclen = 1;
struct kvec vec[2];
size_t veclen = 1;
- mlog
_entry(
"%.*s\n", res->lockname.len, res->lockname.name);
+ mlog
(0,
"%.*s\n", res->lockname.len, res->lockname.name);
memset(&convert, 0, sizeof(struct dlm_convert_lock));
convert.node_idx = dlm->node_num;
memset(&convert, 0, sizeof(struct dlm_convert_lock));
convert.node_idx = dlm->node_num;