ocfs2: o2net: silence uninitialized variable warning
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 10 Feb 2015 22:09:10 +0000 (14:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Feb 2015 22:30:29 +0000 (14:30 -0800)
Smatch complains that, if o2net_tx_can_proceed() returns false, then "sc"
and "ret" are uninialized or maybe we are re-using the data from previous
iteration.  I do not know if we can hit this bug in real life but checking
the return value is harmless and we may as well silence the static checker
warning.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/cluster/tcp.c

index 2e355e0f8335505604ec61f42c8856bd7a23cfb6..56c403a563bc3d01a514516ef1ef974b0b0ae037 100644 (file)
@@ -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);