[Ocfs2-commits] khackel commits r1209 - trunk/src

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-06-24 13:12:35 -0500 (Thu, 24 Jun 2004)
New Revision: 1209

Modified:
   trunk/src/ocfs.h
   trunk/src/util.h
Log:
jeesh fine, you -pedantic freaks



Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-06-24 01:28:37 UTC (rev 1208)
+++ trunk/src/ocfs.h	2004-06-24 18:12:35 UTC (rev 1209)
@@ -970,18 +970,7 @@
 	__ret;							\
 })
 
-#include "util.h"
 
-/* exits when var == val, or on timeout */
-static inline int ocfs_wait_atomic_eq(wait_queue_head_t *wq, atomic_t *var, int val, int timeout)
-{
-	int ret = 0;
-	if (atomic_read(var) != val)
-		ret = __ocfs_wait_atomic_eq(wq, var, val, timeout);
-	return ret;
-}
-
-
 static inline unsigned long ino_from_blkno(struct super_block *sb,
 					   u64 blkno)
 {

Modified: trunk/src/util.h
===================================================================
--- trunk/src/util.h	2004-06-24 01:28:37 UTC (rev 1208)
+++ trunk/src/util.h	2004-06-24 18:12:35 UTC (rev 1209)
@@ -40,4 +40,14 @@
 void ocfs_truncate_inode_pages(struct inode *inode, loff_t off);
 int __ocfs_wait_atomic_eq(wait_queue_head_t *wq, atomic_t *var, int val, int ms);
 
+/* exits when var == val, or on timeout */
+static inline int ocfs_wait_atomic_eq(wait_queue_head_t *wq, atomic_t *var, int val, int timeout)
+{
+	int ret = 0;
+	if (atomic_read(var) != val)
+		ret = __ocfs_wait_atomic_eq(wq, var, val, timeout);
+	return ret;
+}
+
+
 #endif /* OCFS2_UTIL_H */