[SSI] openssi/kernel/cluster/ssi/token msgsup.c,1.12,1.13

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/token
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25002/kernel/cluster/ssi/token

Modified Files:
      Tag: OPENSSI-FC
	msgsup.c 
Log Message:
- msgsend: panic on out of memory, don't wait for memory. revert original behavior.
- msgsup_addid: panic on out of memory, don't wait for memory. revert original behavior.


Index: msgsup.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/token/msgsup.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- msgsup.c	15 Dec 2010 07:36:54 -0000	1.12
+++ msgsup.c	15 Dec 2010 08:04:54 -0000	1.13
@@ -239,7 +239,9 @@
 #ifdef RCU_MSGSUP
 	struct id *newid;
 
-	newid = kmem_cache_alloc(msgsup_id_cachep, GFP_KERNEL|__GFP_NOFAIL);
+	newid = kmem_cache_alloc(msgsup_id_cachep, GFP_KERNEL);
+	if (unlikely(newid == NULL))
+		panic("msgsup_addid: Can't alloc id struct\n");
 	INIT_LIST_HEAD(&newid->id_list);
 	INIT_RCU_HEAD(&newid->id_rcu);
 	newid->id = id;
@@ -383,7 +385,9 @@
 	SSI_ASSERT(op != HINT);
 
 #ifdef RCU_MSGSUP
-	msgp = kmem_cache_alloc(msgsup_cachep, GFP_KERNEL|__GFP_NOFAIL);
+	msgp = kmem_cache_alloc(msgsup_cachep, GFP_KERNEL);
+	if (unlikely(msgp == NULL))
+		panic("msgsend: Can't alloc msg struct\n");
 	INIT_LIST_HEAD(&msgp->msg_list);
 #ifdef RCU_MSGSUP_HASH
 	msgp->in_process_msgs = 0;


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d