summaryrefslogtreecommitdiffstats
path: root/net/tipc/cluster.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-03-08 17:49:24 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-03-08 17:49:24 +0100
commit9446389ef612096704fdf18fa79bab423d4110f0 (patch)
tree3e4fda7270be58ae176d20d318e61fb115b325b5 /net/tipc/cluster.c
parentMerge branch 'cleanups' into next (diff)
parentx86_64: make ptrace always sign-extend orig_ax to 64 bits (diff)
downloadlinux-9446389ef612096704fdf18fa79bab423d4110f0.tar.xz
linux-9446389ef612096704fdf18fa79bab423d4110f0.zip
Merge commit 'origin' into devel
Diffstat (limited to 'net/tipc/cluster.c')
-rw-r--r--net/tipc/cluster.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c
index 95b373913aa0..4bb3404f610b 100644
--- a/net/tipc/cluster.c
+++ b/net/tipc/cluster.c
@@ -142,7 +142,7 @@ void tipc_cltr_attach_node(struct cluster *c_ptr, struct node *n_ptr)
max_n_num = tipc_highest_allowed_slave;
assert(n_num > 0);
assert(n_num <= max_n_num);
- assert(c_ptr->nodes[n_num] == 0);
+ assert(c_ptr->nodes[n_num] == NULL);
c_ptr->nodes[n_num] = n_ptr;
if (n_num > c_ptr->highest_node)
c_ptr->highest_node = n_num;