From 668e557027aabfb3ea5ca6967cca96626280326c Mon Sep 17 00:00:00 2001 From: Kurt Hackel Date: Wed, 17 Jan 2007 15:01:45 -0800 Subject: [PATCH] --- yaml --- r: 46911 b: refs/heads/master c: 90aaaf1c235a70daee04e897e9501415b766de69 h: refs/heads/master i: 46909: 7e40de68b46bd34575ca445c767a7e156767f969 46907: 43d26689fb9e01b69d1018435cf8e24066d8a5fa 46903: 118830b70165c24422f4946829bf28566379c079 46895: ab0da750fcd2b4579ac5950592a45be67291b514 46879: 85842852f419b10e879cef9980badd55e2f37ab9 46847: 8e3d81e956d25d0060afdf9b0faf2f17c013318b v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlm/dlmconvert.c | 28 ++++++---------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 2a4639c6e2c2..f1b1707a521a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6fa36402aba96362311318200d710ea1719e59b +refs/heads/master: 90aaaf1c235a70daee04e897e9501415b766de69 diff --git a/trunk/fs/ocfs2/dlm/dlmconvert.c b/trunk/fs/ocfs2/dlm/dlmconvert.c index 42c177444850..370f23c385f1 100644 --- a/trunk/fs/ocfs2/dlm/dlmconvert.c +++ b/trunk/fs/ocfs2/dlm/dlmconvert.c @@ -479,25 +479,14 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data) } lock = NULL; } - if (!lock) { - __dlm_print_one_lock_resource(res); - list_for_each(iter, &res->granted) { - lock = list_entry(iter, struct dlm_lock, list); - if (lock->ml.node == cnv->node_idx) { - mlog(ML_ERROR, "There is something here " - "for node %u, lock->ml.cookie=%llu, " - "cnv->cookie=%llu\n", cnv->node_idx, - (unsigned long long)lock->ml.cookie, - (unsigned long long)cnv->cookie); - break; - } - } - lock = NULL; - } spin_unlock(&res->spinlock); if (!lock) { status = DLM_IVLOCKID; - dlm_error(status); + 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)); + __dlm_print_one_lock_resource(res); goto leave; } @@ -537,12 +526,7 @@ 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! " - "cookie=%u:%llu\n", - dlm_get_lock_cookie_node(cnv->cookie), - dlm_get_lock_cookie_seq(cnv->cookie)); - else + if (lock) dlm_lock_put(lock); /* either queue the ast or release it, if reserved */