Commit 22ab9014 authored Jul 03, 2013 by Joseph Qi Committed by Linus Torvalds Jul 03, 2013

fs/ocfs2/dlm/dlmrecovery.c:dlm_request_all_locks(): ret should be int instead of enum

In dlm_request_all_locks, ret is type enum.  But o2net_send_message
returns a type int value.  Then it will never run into the following
error branch.  So we should change the ret type from enum to int.

Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: Sunil Mushran <sunil.mushran@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 82d627cf

fs/ocfs2/dlm/dlmrecovery.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -786,7 +786,7 @@ static int dlm_request_all_locks(struct dlm_ctxt *dlm, u8 request_from,
		u8 dead_node)
		{
		struct dlm_lock_request lr;
		enum dlm_status ret;
		int ret;

		mlog(0, "\n");

		@@ -799,7 +799,6 @@ static int dlm_request_all_locks(struct dlm_ctxt *dlm, u8 request_from,
		lr.dead_node = dead_node;

		// send message
		ret = DLM_NOLOCKMGR;
		ret = o2net_send_message(DLM_LOCK_REQUEST_MSG, dlm->key,
		&lr, sizeof(lr), request_from, NULL);