[SSI] openssi/kernel/include/cluster/ssi/util rmtfb.h,1.8,1.9

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

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


Index: rmtfb.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/util/rmtfb.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rmtfb.h	3 Feb 2009 06:18:13 -0000	1.8
+++ rmtfb.h	17 Dec 2009 06:43:51 -0000	1.9
@@ -37,8 +37,11 @@
 
 #define ERFB_TRYAGAIN	750
 
+#if 0
 #define ulbits (sizeof(unsigned long))
 #define rfb_clients_len ((NSC_MAX_NODE_VALUE + ulbits - 1) / ulbits)
+#endif
+#define rfb_clients_len BITS_TO_LONGS(NSC_MAX_NODE_VALUE)
 
 struct rmtfb_cmn {
 	struct list_head	rfb_hash;
@@ -49,12 +52,18 @@
 struct rmtfb_svr {
 	struct rmtfb_cmn	common;		/* must be first */
 	atomic_t		rfb_refcnt;	/* transient references */
+#if 0
 	unsigned long		rfb_clients[rfb_clients_len];
 						/* client node bitmap */
+#endif
+	DECLARE_BITMAP(rfb_clients, NSC_MAX_NODE_VALUE);
 };
 
 struct rmtfb_cli {
 	struct rmtfb_cmn	common;		/* must be first */
+#ifdef RMTFB_REFCNT_FIX
+	atomic_t		rfb_refcnt;	/* transient references */
+#endif
 	u32			rfb_magic;	/* hocus pocus */
 	clusternode_t		rfb_server;	/* fb server node */
 };
@@ -64,6 +73,10 @@
 	unsigned long		id;
 };
 
+#ifdef RMTFB_REFCNT_FIX
+struct rmtfb_cli *ftocli(struct file *file);
+#endif
+
 /* support for unique number server */
 void rmtfb_getids(struct list_head *ids, unsigned long min);
 
@@ -88,10 +101,14 @@
 				  unsigned long id, clusternode_t svr);
 #endif
 
+#ifdef RMTFB_REFCNT_FIX
+void rmtfb_putcli(struct rmtfb_cli *rfb);
+#else
 static inline void rmtfb_putcli(struct rmtfb_cli *rfb)
 {
 	return;
 }
+#endif
 
 struct rmtfb_cli *rmtfb_newcli(struct file *file, unsigned long id,
 			       clusternode_t svr, char noremote);


------------------------------------------------------------------------------
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