[SSI] openssi/kernel/include/cluster/ssi/token comtok.h,1.8,1.9

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

Modified Files:
      Tag: OPENSSI-FC
	comtok.h 
Log Message:
Multiple bug fixes. See ChangeLog.


Index: comtok.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/token/comtok.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- comtok.h	27 Oct 2009 03:18:30 -0000	1.8
+++ comtok.h	17 Dec 2009 06:43:51 -0000	1.9
@@ -130,8 +130,10 @@
 
 #define	DSPOBJ(objp, str)	(*(objp)->obj_pp->p_cliops->objstr)(objp, str)
 #define	TRANSPORT(objp)		(*(objp)->obj_pp->p_cliops->transport)
+
 #define	REVFUNC(objp)		((objp)->obj_pp->p_cliops->revoke)
 #define	QRYFUNC(objp)		((objp)->obj_pp->p_cliops->query)
+
 #define	TARGET(objp, agent)		(*((objp)->obj_pp->p_cliops->target))(objp, agent)
 #define	HOLDOBJ(objp)		if ((objp)->obj_pp->p_cliops->hold_obj)	\
 					(*((objp)->obj_pp->p_cliops->hold_obj))(objp); \
@@ -139,8 +141,12 @@
 #define	MSTR(objp, mode)	(*(objp)->obj_pp->p_cliops->modestr)(objp, mode)
 #define	MSGSEND(objp, op, start, len, agent, oldmode, newmode)\
 				(*(objp)->obj_pp->p_cliops->msgsend)(objp, op, start, len, agent, oldmode, newmode)
-#define	REQDONE(objp, reqp)	(*(objp)->obj_pp->p_cliops->reqdone) \
-					((objp), (reqp))
+
+#define	REQFUNC(objp)		((objp)->obj_pp->p_cliops->reqdone)
+#define	REQDONE(objp, reqp)	do { \
+	BUG_ON(REQFUNC(objp) == NULL); \
+	(*REQFUNC(objp))(objp, reqp); \
+} while (0)
 
 #define	ALLOWS(objp, mode, chkmode)	((ALLOW_TABLE(objp)[mode] & MODEBITVAL((chkmode))) != 0)
 


------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev