2 files changed, 8 insertions, 7 deletions

diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 2e355e0f8335..56c403a563bc 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1016,7 +1016,8 @@ void o2net_fill_node_map(unsigned long *map, unsigned bytes)
 
         memset(map, 0, bytes);
         for (node = 0; node < O2NM_MAX_NODES; ++node) {
-                o2net_tx_can_proceed(o2net_nn_from_num(node), &sc, &ret);
+                if (!o2net_tx_can_proceed(o2net_nn_from_num(node), &sc, &ret))
+                        continue;
                 if (!ret) {
                         set_bit(node, map);
                         sc_put(sc);
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h
index dc024367110a..b95e7df5b76a 100644
--- a/fs/ocfs2/cluster/tcp_internal.h
+++ b/fs/ocfs2/cluster/tcp_internal.h
@@ -107,12 +107,12 @@ struct o2net_node {
         struct list_head                nn_status_list;
 
         /* connects are attempted from when heartbeat comes up until either hb
-         * goes down, the node is unconfigured, no connect attempts succeed
-         * before O2NET_CONN_IDLE_DELAY, or a connect succeeds.  connect_work
-         * is queued from set_nn_state both from hb up and from itself if a
-         * connect attempt fails and so can be self-arming.  shutdown is
-         * careful to first mark the nn such that no connects will be attempted
-         * before canceling delayed connect work and flushing the queue. */
+         * goes down, the node is unconfigured, or a connect succeeds.
+         * connect_work is queued from set_nn_state both from hb up and from
+         * itself if a connect attempt fails and so can be self-arming.
+         * shutdown is careful to first mark the nn such that no connects will
+         * be attempted before canceling delayed connect work and flushing the
+         * queue. */
         struct delayed_work             nn_connect_work;
         unsigned long                   nn_last_connect_attempt;