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>
This commit is contained in:
Родитель
46832b2de5
Коммит
aa7b58597f
|
@ -1609,8 +1609,6 @@ way_up_top:
|
|||
__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,8 +1623,7 @@ way_up_top:
|
|||
response = DLM_MASTER_RESP_NO;
|
||||
} else
|
||||
response = DLM_MASTER_RESP_MAYBE;
|
||||
if (set_maybe)
|
||||
set_bit(request->node_idx, tmpmle->maybe_map);
|
||||
set_bit(request->node_idx, tmpmle->maybe_map);
|
||||
spin_unlock(&tmpmle->spinlock);
|
||||
}
|
||||
spin_unlock(&dlm->master_lock);
|
||||
|
|
Загрузка…
Ссылка в новой задаче