Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28bb5ef4 authored by piaojun's avatar piaojun Committed by Linus Torvalds
Browse files

ocfs2/dlm: clean up deadcode in dlm_master_request_handler() 

When 'dispatch_assert' is set, 'response' must be DLM_MASTER_RESP_YES,
and 'res' won't be null, so execution can't reach these two branch.

Link: http://lkml.kernel.org/r/58174C91.3040004@huawei.com


Signed-off-by: default avatarJun Piao <piaojun@huawei.com>
Reviewed-by: default avatarJoseph Qi Joseph Qi <jiangqi903@gmail.com>
Cc: Mark Fasheh <mfasheh@versity.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aa7b5859

fs/ocfs2/dlm/dlmmaster.c

+0 −6
Original line number Diff line number Diff line
@@ -1641,12 +1641,6 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data, 
	 * dlm_assert_master_worker() isn't called, we drop it here.

	 */

	if (dispatch_assert) {

		if (response != DLM_MASTER_RESP_YES)

			mlog(ML_ERROR, "invalid response %d\n", response);

		if (!res) {

			mlog(ML_ERROR, "bad lockres while trying to assert!\n");

			BUG();

		}

		mlog(0, "%u is the owner of %.*s, cleaning everyone else\n",

			     dlm->node_num, res->lockname.len, res->lockname.name);

		spin_lock(&res->spinlock);