From: Sunil Mushran <sunil.mushran@oracle.com>
Date: Wed, 23 Nov 2011 18:50:23 +0000 (-0800)
Subject: ocfs2/cluster: Fix o2net_fill_node_map()
X-Git-Tag: v2.6.39-400.9.0~573
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=76e1a3554a9fc316cfc247441825fe5b659923bd;p=users%2Fjedix%2Flinux-maple.git

ocfs2/cluster: Fix o2net_fill_node_map()

Fix an oops having the following stack trace....
o2net_fill_node_map() => o2net_tx_can_proceed() => sc_put() => kref_put() => sc_kref_release()

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
---

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 3f55d832047a..c371ff1d4aee 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1038,14 +1038,14 @@ static int o2net_tx_can_proceed(struct o2net_node *nn,
 void o2net_fill_node_map(unsigned long *map, unsigned bytes)
 {
 	struct o2net_sock_container *sc;
-	int node, ret;
+	int node, err, ret;
 
 	BUG_ON(bytes < (BITS_TO_LONGS(O2NM_MAX_NODES) * sizeof(unsigned long)));
 
 	memset(map, 0, bytes);
 	for (node = 0; node < O2NM_MAX_NODES; ++node) {
-		o2net_tx_can_proceed(o2net_nn_from_num(node), &sc, &ret);
-		if (!ret) {
+		ret = o2net_tx_can_proceed(o2net_nn_from_num(node), &sc, &err);
+		if (ret && !err) {
 			set_bit(node, map);
 			sc_put(sc);
 		}