[SSI] openssi/kernel/cluster/ssi/util ssidev.c,1.32,1.33

Roger Tsang <[email protected]> Mon, 17 Jan 2011 06:20:31 +0000
Newsgroups gmane.linux.cluster.ssic.cvs
Message-ID <[email protected]>
Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/util
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24367/cluster/ssi/util

Modified Files:
      Tag: OPENSSI-FC
	ssidev.c 
Log Message:
__ssidev_do_poll_getf: no longer always inline.


Index: ssidev.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/util/ssidev.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ssidev.c	25 Oct 2010 04:45:11 -0000	1.32
+++ ssidev.c	17 Jan 2011 06:20:29 -0000	1.33
@@ -1404,8 +1404,7 @@
 	return (pcount > 0 ? pcount : error);
 }
 
-static inline int __ssidev_do_poll_getf(unsigned int num,
-					ssidev_pollfd_t *sfdcp)
+static int __ssidev_do_poll_getf(unsigned int num, ssidev_pollfd_t *sfdcp)
 {
 	int error = 0;
 	unsigned int i;
@@ -1418,14 +1417,11 @@
 		if (IS_ERR(rfb)) {
 			error = PTR_ERR(rfb);
 			sfdp->pf_file = NULL;
-		} else {
-			sfdp->pf_file = rfb->common.rfb_file;
-#if 0
-			SSI_ASSERT(sfdp->pf_file != NULL);
-#endif
-			get_file(sfdp->pf_file);
-			rmtfb_putsvr(rfb);
+			continue;
 		}
+		sfdp->pf_file = rfb->common.rfb_file;
+		get_file(sfdp->pf_file);
+		rmtfb_putsvr(rfb);
 	}
 
 	return error;


------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl