The patch titled
Subject: ocfs2: delete redundant code and set the node bit into maybe_map directly
has been added to the -mm tree. Its filename is
ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Guozhonghua <guozhonghua@xxxxxxx>
Subject: 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@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Guozhonghua <guozhonghua@xxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <joseph.qi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlm/dlmmaster.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff -puN fs/ocfs2/dlm/dlmmaster.c~ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlm/dlmmaster.c~ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly
+++ a/fs/ocfs2/dlm/dlmmaster.c
@@ -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);
_
Patches currently in -mm which might be from guozhonghua@xxxxxxx are
ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
