Commit aa7b5859 authored Dec 12, 2016 by Guozhonghua Committed by Linus Torvalds Dec 12, 2016

ocfs2: delete redundant code and set the node bit into maybe_map directly

The variable `set_maybe' is redundant when the mle has been found in the
map.  So it is ok to set the node_idx into mle's maybe_map directly.

Link: http://lkml.kernel.org/r/71604351584F6A4EBAE558C676F37CA4A3D490DD@H3CMLB12-EX.srv.huawei-3com.com


Signed-off-by: Guozhonghua <guozhonghua@h3c.com>
Reviewed-by: Mark Fasheh <mfasheh@versity.com>
Reviewed-by: Joseph Qi <jiangqi903@gmail.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 46832b2d

fs/ocfs2/dlm/dlmmaster.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1609,8 +1609,6 @@ int dlm_master_request_handler(struct o2net_msg msg, u32 len, void data,
		__dlm_insert_mle(dlm, mle);
		response = DLM_MASTER_RESP_NO;
		} else {
		// mlog(0, "mle was found\n");
		set_maybe = 1;
		spin_lock(&tmpmle->spinlock);
		if (tmpmle->master == dlm->node_num) {
		mlog(ML_ERROR, "no lockres, but an mle with this node as master!\n");
		@@ -1625,7 +1623,6 @@ int dlm_master_request_handler(struct o2net_msg msg, u32 len, void data,
		response = DLM_MASTER_RESP_NO;
		} else
		response = DLM_MASTER_RESP_MAYBE;
		if (set_maybe)
		set_bit(request->node_idx, tmpmle->maybe_map);
		spin_unlock(&tmpmle->spinlock);
		}