Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
fs/ocfs2/dlm/dlmmaster.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 005261c..1fadc39 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -1888,8 +1888,10 @@ ok:
* up nodes that this node contacted */
while ((nn = find_next_bit (mle->response_map, O2NM_MAX_NODES,
nn+1)) < O2NM_MAX_NODES) {
- if (nn != dlm->node_num && nn != assert->node_idx)
+ if (nn != dlm->node_num && nn != assert->node_idx) {
master_request = 1;
+ break;
+ }
}
}
mle->master = assert->node_idx;
--
1.7.9.5
On Wed, Jul 11, 2012 at 02:49:56PM +0800, Junxiao Bi wrote:> Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com> > --- > fs/ocfs2/dlm/dlmmaster.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c > index 005261c..1fadc39 100644 > --- a/fs/ocfs2/dlm/dlmmaster.c > +++ b/fs/ocfs2/dlm/dlmmaster.c > @@ -1888,8 +1888,10 @@ ok: > * up nodes that this node contacted */ > while ((nn = find_next_bit (mle->response_map, O2NM_MAX_NODES, > nn+1)) < O2NM_MAX_NODES) { > - if (nn != dlm->node_num && nn != assert->node_idx) > + if (nn != dlm->node_num && nn != assert->node_idx) { > master_request = 1; > + break; > + }Seems like this will save a tiny bit of CPU in the assert master handler. Sunil, can you see any problem? Joel> } > } > mle->master = assert->node_idx; > -- > 1.7.9.5 >-- "To announce that there must be no criticism of them president, or that we are to stand by the president, right or wrong, is not only unpatriotic and servile, but is morally treasonable to the American public." - Theodore Roosevelt http://www.jlbec.org/ jlbec at evilplan.org
On Wed, Jul 11, 2012 at 02:49:56PM +0800, Junxiao Bi wrote:> Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>This patch is now part of the fixes branch of ocfs2.git. Joel> --- > fs/ocfs2/dlm/dlmmaster.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c > index 005261c..1fadc39 100644 > --- a/fs/ocfs2/dlm/dlmmaster.c > +++ b/fs/ocfs2/dlm/dlmmaster.c > @@ -1888,8 +1888,10 @@ ok: > * up nodes that this node contacted */ > while ((nn = find_next_bit (mle->response_map, O2NM_MAX_NODES, > nn+1)) < O2NM_MAX_NODES) { > - if (nn != dlm->node_num && nn != assert->node_idx) > + if (nn != dlm->node_num && nn != assert->node_idx) { > master_request = 1; > + break; > + } > } > } > mle->master = assert->node_idx; > -- > 1.7.9.5 >-- "I think it would be a good idea." - Mahatma Ghandi, when asked what he thought of Western civilization http://www.jlbec.org/ jlbec at evilplan.org