[Ocfs-tools-commits] manish commits r38 - in trunk: format libocfs

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-05-20 21:50:23 -0500 (Thu, 20 May 2004)
New Revision: 38

Modified:
   trunk/format/journal.c
   trunk/libocfs/libocfs.h
Log:
Prevent multiple incompatible list_head definitions with the format journal
create stuff. So so ugly.


Modified: trunk/format/journal.c
===================================================================
--- trunk/format/journal.c	2004-05-21 02:48:41 UTC (rev 37)
+++ trunk/format/journal.c	2004-05-21 02:50:23 UTC (rev 38)
@@ -1,3 +1,6 @@
+/* MUST BE BEFORE format.h */
+#include "kernel-list.h"
+
 #include <format.h>
 #include <signal.h>
 #include <libgen.h>

Modified: trunk/libocfs/libocfs.h
===================================================================
--- trunk/libocfs/libocfs.h	2004-05-21 02:48:41 UTC (rev 37)
+++ trunk/libocfs/libocfs.h	2004-05-21 02:50:23 UTC (rev 38)
@@ -94,6 +94,17 @@
 #include <sys/time.h>
 #include <sys/mman.h>
 
+/* Special case, cause of twisty nested includes */
+#ifndef _LINUX_LIST_H
+#define INIT_LIST_HEAD(a)	do { } while(0)
+#define list_add_tail(a,b)	do { } while(0)
+#define list_del(a)		do { } while(0)
+struct list_head
+{
+    struct list_head *next, *prev;
+};
+#endif
+
 /* reqd by ocfsformat */
 #undef WNOHANG
 #undef WUNTRACED
@@ -110,9 +121,6 @@
 
 
 /* it sucks, but i have to fake a few types to get by */
-#define INIT_LIST_HEAD(a)	do { } while(0)
-#define list_add_tail(a,b)	do { } while(0)
-#define list_del(a)		do { } while(0)
 #define spin_lock_init(lock)    do { } while(0)
 #define spin_lock(lock)         (void)(lock) /* Not "unused variable". */
 #define spin_is_locked(lock)    (0)
@@ -226,10 +234,6 @@
 {
     int semid;
 };
-struct list_head
-{
-    int a;
-};
 struct inode
 {
     void * i_mapping;