<div dir="ltr">Acked-by: Sunil Mushran <<a href="mailto:sunil.mushran@gmail.com">sunil.mushran@gmail.com</a>><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 22, 2013 at 8:50 AM, Joseph Qi <span dir="ltr"><<a href="mailto:joseph.qi@huawei.com" target="_blank">joseph.qi@huawei.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">In dlm_request_all_locks, ret is type enum. But o2net_send_message<br>
returns a type int value. Then it will never run into the following<br>
error branch. So we should change the ret type from enum to int.<br>
<br>
Signed-off-by: Joseph Qi <<a href="mailto:joseph.qi@huawei.com">joseph.qi@huawei.com</a>><br>
<br>
---<br>
fs/ocfs2/dlm/dlmrecovery.c | 3 +--<br>
1 file changed, 1 insertion(+), 2 deletions(-)<br>
<br>
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c<br>
index 060af11..a83e378 100644<br>
--- a/fs/ocfs2/dlm/dlmrecovery.c<br>
+++ b/fs/ocfs2/dlm/dlmrecovery.c<br>
@@ -786,7 +786,7 @@ static int dlm_request_all_locks(struct dlm_ctxt<br>
*dlm, u8 request_from,<br>
u8 dead_node)<br>
{<br>
struct dlm_lock_request lr;<br>
- enum dlm_status ret;<br>
+ int ret;<br>
<br>
mlog(0, "\n");<br>
<br>
@@ -799,7 +799,6 @@ static int dlm_request_all_locks(struct dlm_ctxt<br>
*dlm, u8 request_from,<br>
lr.dead_node = dead_node;<br>
<br>
// send message<br>
- ret = DLM_NOLOCKMGR;<br>
ret = o2net_send_message(DLM_LOCK_REQUEST_MSG, dlm->key,<br>
&lr, sizeof(lr), request_from, NULL);<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.7.9.7<br>
<br>
<br>
_______________________________________________<br>
Ocfs2-devel mailing list<br>
<a href="mailto:Ocfs2-devel@oss.oracle.com">Ocfs2-devel@oss.oracle.com</a><br>
<a href="https://oss.oracle.com/mailman/listinfo/ocfs2-devel" target="_blank">https://oss.oracle.com/mailman/listinfo/ocfs2-devel</a><br>
</font></span></blockquote></div><br></div>