[Ocfs2-commits] manish commits r2454 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-07-01 18:31:07 -0500 (Fri, 01 Jul 2005)
New Revision: 2454

Modified:
   trunk/fs/ocfs2/cluster/masklog.h
   trunk/fs/ocfs2/cluster/net_proc.c
   trunk/fs/ocfs2/cluster/nodemanager.h
   trunk/fs/ocfs2/cluster/quorum.c
   trunk/fs/ocfs2/cluster/tcp.c
Log:
Rearrange some headers, pull in some needed ones.

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/cluster/masklog.h
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.h	2005-07-01 20:48:56 UTC (rev 2453)
+++ trunk/fs/ocfs2/cluster/masklog.h	2005-07-01 23:31:07 UTC (rev 2454)
@@ -78,6 +78,9 @@
  * )
  */
 
+/* for task_struct */
+#include <linux/sched.h>
+
 /* bits that are frequently given and infrequently matched in the low word */
 /* NOTE: If you add a flag, you need to also update mlog.c! */
 #define ML_ENTRY	0x0000000000000001ULL /* func call entry */

Modified: trunk/fs/ocfs2/cluster/net_proc.c
===================================================================
--- trunk/fs/ocfs2/cluster/net_proc.c	2005-07-01 20:48:56 UTC (rev 2453)
+++ trunk/fs/ocfs2/cluster/net_proc.c	2005-07-01 23:31:07 UTC (rev 2454)
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/slab.h>
+#include <linux/idr.h>
 #include <linux/kref.h>
 #include <linux/seq_file.h>
 

Modified: trunk/fs/ocfs2/cluster/nodemanager.h
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.h	2005-07-01 20:48:56 UTC (rev 2453)
+++ trunk/fs/ocfs2/cluster/nodemanager.h	2005-07-01 23:31:07 UTC (rev 2454)
@@ -31,7 +31,7 @@
 
 /* This totally doesn't belong here. */
 #include <linux/configfs.h>
-#include <linux/idr.h>
+#include <linux/rbtree.h>
 
 #define KERN_OCFS2		988
 #define KERN_OCFS2_NM		1

Modified: trunk/fs/ocfs2/cluster/quorum.c
===================================================================
--- trunk/fs/ocfs2/cluster/quorum.c	2005-07-01 20:48:56 UTC (rev 2453)
+++ trunk/fs/ocfs2/cluster/quorum.c	2005-07-01 23:31:07 UTC (rev 2454)
@@ -45,6 +45,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/workqueue.h>
 
 #include "heartbeat.h"
 #include "nodemanager.h"

Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c	2005-07-01 20:48:56 UTC (rev 2453)
+++ trunk/fs/ocfs2/cluster/tcp.c	2005-07-01 23:31:07 UTC (rev 2454)
@@ -55,6 +55,7 @@
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/idr.h>
 #include <linux/kref.h>
 #include <net/tcp.h>