[SSI] openssi/kernel/cluster/ssi/clreg clreg_head.c, 1.5, 1.6 clreg_subr.c, 1.6, 1.7

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/clreg
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16224/kernel/cluster/ssi/clreg

Modified Files:
      Tag: OPENSSI-FC
	clreg_head.c clreg_subr.c 
Log Message:
Bug fixes and enhancements. See ChangeLog.


Index: clreg_subr.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/clreg/clreg_subr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- clreg_subr.c	4 Nov 2004 03:50:54 -0000	1.6
+++ clreg_subr.c	27 Oct 2009 03:18:29 -0000	1.7
@@ -200,9 +200,6 @@
 		CLREG_DOMAIN_EXCL_UNLOCK(*dpp);
 		clreg_free_entry(ep);
 
-		if (eargsp->flags & CLREG_FLAG_CREATE)
-			ep->cre_flags |= CLREG_ENTRY_CREATE;
-
 		/*
 		 * In order to complete a no-sleep registration, the
 		 * caller must guarantee that the registration will
@@ -216,6 +213,9 @@
 		ep = CLREG_HEAD_TO_ENTRY(hp);
 
 		CLREG_ENTRY_MOD_EXCL_LOCK(ep);
+
+		if (eargsp->flags & CLREG_FLAG_CREATE)
+			ep->cre_flags |= CLREG_ENTRY_CREATE;
 		ep->cre_update_func = eargsp->update_func;
 		ep->cre_update_arg = eargsp->update_arg;
 
@@ -287,9 +287,7 @@
 	SSI_ASSERT(nodelist != NULL);
 
 	num_nodes = NSC_NODELIST_COUNT(nodelist);
-	handle_list = (cli_handle_t **)kmalloc(
-					num_nodes * sizeof(cli_handle_t *),
-					GFP_KERNEL);
+	handle_list = kmalloc_nofail(num_nodes * sizeof(**handle_list));
 
 	/*
 	 * Send shutdown notifications to all nodes in the cluster.

Index: clreg_head.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/clreg/clreg_head.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- clreg_head.c	7 Aug 2007 03:06:09 -0000	1.5
+++ clreg_head.c	27 Oct 2009 03:18:29 -0000	1.6
@@ -403,11 +403,9 @@
 		CLREG_DOMAIN_SHR_UNLOCK(dp);
 
 	entries_list = (clreg_head_t **)
-			kmalloc(sizeof(clreg_head_t *) * pre_num_entries,
-				   GFP_KERNEL);
+			kmalloc_nofail(sizeof(clreg_head_t *) * pre_num_entries);
 	domains_list = (clreg_head_t **)
-			kmalloc(sizeof(clreg_head_t *) * pre_num_domains,
-				   GFP_KERNEL);
+			kmalloc_nofail(sizeof(clreg_head_t *) * pre_num_domains);
 
 	if (!(flags & CLREG_WALK_NOLOCK))
 		CLREG_DOMAIN_SHR_LOCK(dp);


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference