diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmlock.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmlock.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c index 671d4ff222cc..6fea28318d6d 100644 --- a/fs/ocfs2/dlm/dlmlock.c +++ b/fs/ocfs2/dlm/dlmlock.c | |||
@@ -141,13 +141,23 @@ static enum dlm_status dlmlock_master(struct dlm_ctxt *dlm, | |||
141 | res->lockname.len)) { | 141 | res->lockname.len)) { |
142 | kick_thread = 1; | 142 | kick_thread = 1; |
143 | call_ast = 1; | 143 | call_ast = 1; |
144 | } else { | ||
145 | mlog(0, "%s: returning DLM_NORMAL to " | ||
146 | "node %u for reco lock\n", dlm->name, | ||
147 | lock->ml.node); | ||
144 | } | 148 | } |
145 | } else { | 149 | } else { |
146 | /* for NOQUEUE request, unless we get the | 150 | /* for NOQUEUE request, unless we get the |
147 | * lock right away, return DLM_NOTQUEUED */ | 151 | * lock right away, return DLM_NOTQUEUED */ |
148 | if (flags & LKM_NOQUEUE) | 152 | if (flags & LKM_NOQUEUE) { |
149 | status = DLM_NOTQUEUED; | 153 | status = DLM_NOTQUEUED; |
150 | else { | 154 | if (dlm_is_recovery_lock(res->lockname.name, |
155 | res->lockname.len)) { | ||
156 | mlog(0, "%s: returning NOTQUEUED to " | ||
157 | "node %u for reco lock\n", dlm->name, | ||
158 | lock->ml.node); | ||
159 | } | ||
160 | } else { | ||
151 | dlm_lock_get(lock); | 161 | dlm_lock_get(lock); |
152 | list_add_tail(&lock->list, &res->blocked); | 162 | list_add_tail(&lock->list, &res->blocked); |
153 | kick_thread = 1; | 163 | kick_thread = 1; |