Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / net / tipc / zone.c

diff --git a/net/tipc/zone.c b/net/tipc/zone.c
index 7c11f7f83a2188541fff3378b6681523d41e38c3..114e173f11a5fbbb6b459219984778fe44ebd2d8 100644 (file)
--- a/net/tipc/zone.c
+++ b/net/tipc/zone.c
@@ -1,6 +1,6 @@
 /*
  * net/tipc/zone.c: TIPC zone management routines
- * 
+ *
  * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -44,19 +44,23 @@
 
 struct _zone *tipc_zone_create(u32 addr)
 {
-       struct _zone *z_ptr = 0;
+       struct _zone *z_ptr;
        u32 z_num;
 
-       if (!tipc_addr_domain_valid(addr))
-               return 0;
+       if (!tipc_addr_domain_valid(addr)) {
+               err("Zone creation failed, invalid domain 0x%x\n", addr);
+               return NULL;
+       }
 
-       z_ptr = (struct _zone *)kmalloc(sizeof(*z_ptr), GFP_ATOMIC);
-       if (z_ptr != NULL) {
-               memset(z_ptr, 0, sizeof(*z_ptr));
-               z_num = tipc_zone(addr);
-               z_ptr->addr = tipc_addr(z_num, 0, 0);
-               tipc_net.zones[z_num] = z_ptr;
+       z_ptr = kzalloc(sizeof(*z_ptr), GFP_ATOMIC);
+       if (!z_ptr) {
+               warn("Zone creation failed, insufficient memory\n");
+               return NULL;
        }
+
+       z_num = tipc_zone(addr);
+       z_ptr->addr = tipc_addr(z_num, 0, 0);
+       tipc_net.zones[z_num] = z_ptr;
        return z_ptr;
 }
 
@@ -88,7 +92,7 @@ void tipc_zone_remove_as_router(struct _zone *z_ptr, u32 router)
 
        for (c_num = 1; c_num <= tipc_max_clusters; c_num++) {
                if (z_ptr->clusters[c_num]) {
-                       tipc_cltr_remove_as_router(z_ptr->clusters[c_num], 
+                       tipc_cltr_remove_as_router(z_ptr->clusters[c_num],
                                                   router);
                }
        }
@@ -114,10 +118,10 @@ struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref
        u32 c_num;
 
        if (!z_ptr)
-               return 0;
+               return NULL;
        c_ptr = z_ptr->clusters[tipc_cluster(addr)];
        if (!c_ptr)
-               return 0;
+               return NULL;
        n_ptr = tipc_cltr_select_node(c_ptr, ref);
        if (n_ptr)
                return n_ptr;
@@ -126,12 +130,12 @@ struct node *tipc_zone_select_remote_node(struct _zone *z_ptr, u32 addr, u32 ref
        for (c_num = 1; c_num <= tipc_max_clusters; c_num++) {
                c_ptr = z_ptr->clusters[c_num];
                if (!c_ptr)
-                       return 0;
+                       return NULL;
                n_ptr = tipc_cltr_select_node(c_ptr, ref);
                if (n_ptr)
                        return n_ptr;
        }
-       return 0;
+       return NULL;
 }
 
 u32 tipc_zone_select_router(struct _zone *z_ptr, u32 addr, u32 ref)