diff --git a/[refs] b/[refs] index 13dedcdc9010..d39f076c271d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b220532a71adf65d45c3aa8a284bfa7ec57957bd +refs/heads/master: 44a7f1d063bbe45773353903f36d9d88fb73d82a diff --git a/trunk/fs/ocfs2/dlm/dlmconvert.c b/trunk/fs/ocfs2/dlm/dlmconvert.c index 2f7ad5261281..b24fa537a767 100644 --- a/trunk/fs/ocfs2/dlm/dlmconvert.c +++ b/trunk/fs/ocfs2/dlm/dlmconvert.c @@ -484,7 +484,7 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data) list_for_each(iter, &res->granted) { lock = list_entry(iter, struct dlm_lock, list); if (lock->ml.node == cnv->node_idx) { - mlog(0, "There is something here " + mlog(ML_ERROR, "There is something here " "for node %u, lock->ml.cookie=%llu, " "cnv->cookie=%llu\n", cnv->node_idx, lock->ml.cookie, cnv->cookie);