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
/
dlmlock.c
diff --git
a/fs/ocfs2/dlm/dlmlock.c
b/fs/ocfs2/dlm/dlmlock.c
index
6fea283
..
671d4ff
100644
(file)
--- a/
fs/ocfs2/dlm/dlmlock.c
+++ b/
fs/ocfs2/dlm/dlmlock.c
@@
-141,23
+141,13
@@
static enum dlm_status dlmlock_master(struct dlm_ctxt *dlm,
res->lockname.len)) {
kick_thread = 1;
call_ast = 1;
res->lockname.len)) {
kick_thread = 1;
call_ast = 1;
- } else {
- mlog(0, "%s: returning DLM_NORMAL to "
- "node %u for reco lock\n", dlm->name,
- lock->ml.node);
}
} else {
/* for NOQUEUE request, unless we get the
* lock right away, return DLM_NOTQUEUED */
}
} else {
/* for NOQUEUE request, unless we get the
* lock right away, return DLM_NOTQUEUED */
- if (flags & LKM_NOQUEUE)
{
+ if (flags & LKM_NOQUEUE)
status = DLM_NOTQUEUED;
status = DLM_NOTQUEUED;
- if (dlm_is_recovery_lock(res->lockname.name,
- res->lockname.len)) {
- mlog(0, "%s: returning NOTQUEUED to "
- "node %u for reco lock\n", dlm->name,
- lock->ml.node);
- }
- } else {
+ else {
dlm_lock_get(lock);
list_add_tail(&lock->list, &res->blocked);
kick_thread = 1;
dlm_lock_get(lock);
list_add_tail(&lock->list, &res->blocked);
kick_thread = 1;