[SSI] openssi/kernel/cluster/ssi/util rmtfb.c,1.28,1.29

Roger Tsang <[email protected]> Thu, 06 May 2010 05:25:09 +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-serv13311/cluster/ssi/util

Modified Files:
      Tag: OPENSSI-FC
	rmtfb.c 
Log Message:
- Get rid of compiler warning in rmtfb_getcmn() when CONFIG_PREEMPT is defined. (#ifdef RMTFB_HASH_LOCKLESS)


Index: rmtfb.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/util/rmtfb.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- rmtfb.c	5 Mar 2010 06:05:59 -0000	1.28
+++ rmtfb.c	6 May 2010 05:25:07 -0000	1.29
@@ -698,20 +698,20 @@
 {
 	struct rmtfb_cmn *cmn;
 	struct hlist_node *pos;
-#ifdef RMTFB_HASH_LOCKLESS
-	char found = 0;
 
+#ifdef RMTFB_HASH_LOCKLESS
 	rcu_read_lock();
 	hlist_for_each_entry_rcu(cmn, pos, head, rfb_hash) {
 		if (!test(cmn, data))
 			continue;
 		if (!atomic_test_and_add(1, &cmn->rfb_ref_cnt))
 			continue;
-		found = 1;
-		break;
+		goto found;
 	}
+	cmn = NULL;
+found:
 	rcu_read_unlock();
-	return found ? cmn : NULL;
+	return cmn;
 #else
 	hlist_for_each_entry(cmn, pos, head, rfb_hash) {
 		if (test(cmn, data))


------------------------------------------------------------------------------