[Ocfs2-commits] manish commits r2338 - in trunk/fs/ocfs2: . cluster

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-05-30 13:49:01 -0500 (Mon, 30 May 2005)
New Revision: 2338

Modified:
   trunk/fs/ocfs2/cluster/heartbeat.c
   trunk/fs/ocfs2/cluster/masklog.c
   trunk/fs/ocfs2/cluster/net_proc.c
   trunk/fs/ocfs2/cluster/nodemanager.c
   trunk/fs/ocfs2/cluster/tcp.c
   trunk/fs/ocfs2/cluster/tcp.h
   trunk/fs/ocfs2/dlmglue.c
Log:
Get rid of a horde of useless #includes

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/cluster/heartbeat.c	2005-05-30 18:49:01 UTC (rev 2338)
@@ -19,45 +19,16 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/bio.h>
-#include <linux/mount.h>
-#include <linux/vfs.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/highmem.h>
-#include <linux/utsname.h>
-#include <linux/init.h>
-#include <linux/sysctl.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
 #include <linux/blkdev.h>
-#include <linux/socket.h>
-#include <linux/inet.h>
-#include <linux/in.h>
-
-#include <linux/linkage.h>
-#include <linux/time.h>
 #include <linux/delay.h>
-#include <linux/errno.h>
-#include <linux/fcntl.h>
-#include <linux/net.h>
-#include <linux/unistd.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/pagemap.h>
 #include <linux/file.h>
-#include <linux/bitops.h>
 #include <linux/kthread.h>
 #include "configfs.h"
 
-#include <asm/uaccess.h>
-#include <asm/bitops.h>
-
 #include "heartbeat.h"
 #include "tcp.h"
 #include "nodemanager.h"

Modified: trunk/fs/ocfs2/cluster/masklog.c
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.c	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/cluster/masklog.c	2005-05-30 18:49:01 UTC (rev 2338)
@@ -21,7 +21,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/string.h>

Modified: trunk/fs/ocfs2/cluster/net_proc.c
===================================================================
--- trunk/fs/ocfs2/cluster/net_proc.c	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/cluster/net_proc.c	2005-05-30 18:49:01 UTC (rev 2338)
@@ -20,21 +20,8 @@
  */
 
 #include <linux/module.h>
-#include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/slab.h>
-#include <linux/highmem.h>
-#include <linux/utsname.h>
-#include <linux/init.h>
-#include <linux/sysctl.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#include <linux/blkdev.h>
-#include <linux/proc_fs.h>
-#include <linux/file.h>
-#include <linux/kthread.h>
 #include <linux/kref.h>
 #include <linux/seq_file.h>
 

Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/cluster/nodemanager.c	2005-05-30 18:49:01 UTC (rev 2338)
@@ -19,42 +19,11 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/mount.h>
-#include <linux/vfs.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/highmem.h>
-#include <linux/utsname.h>
-#include <linux/init.h>
-#include <linux/sysctl.h>
-#include <linux/random.h>
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#include <linux/namei.h>
-#include <linux/blkdev.h>
-#include <linux/socket.h>
-#include <linux/inet.h>
-#include <linux/in.h>
 #include <linux/module.h>
-
-#include <linux/linkage.h>
-#include <linux/time.h>
-#include <linux/errno.h>
-#include <linux/fcntl.h>
-#include <linux/net.h>
-#include <linux/unistd.h>
+#include <linux/sysctl.h>
 #include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/pagemap.h>
-#include <linux/hash.h>
-#include <linux/bitops.h>
 
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
-
 #include "tcp.h"
 #include "nodemanager.h"
 #include "heartbeat.h"

Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/cluster/tcp.c	2005-05-30 18:49:01 UTC (rev 2338)
@@ -78,26 +78,11 @@
  * 	- go nuts adding static
  */
 
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/types.h>
+#include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/highmem.h>
-#include <linux/utsname.h>
-#include <linux/init.h>
-#include <linux/sysctl.h>
-#include <linux/random.h>
-#include <linux/version.h>
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#include <linux/blkdev.h>
-#include <linux/proc_fs.h>
-#include <linux/file.h>
 #include <linux/kthread.h>
 #include <linux/kref.h>
 
-#include <asm/uaccess.h>
-
 #include "heartbeat.h"
 #include "tcp.h"
 #include "nodemanager.h"

Modified: trunk/fs/ocfs2/cluster/tcp.h
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.h	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/cluster/tcp.h	2005-05-30 18:49:01 UTC (rev 2338)
@@ -27,8 +27,6 @@
 #ifndef CLUSTER_TCP_H
 #define CLUSTER_TCP_H
 
-#include <linux/version.h>
-
 #include <linux/socket.h>
 #ifdef __KERNEL__
 #include <net/sock.h>

Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c	2005-05-30 18:48:33 UTC (rev 2337)
+++ trunk/fs/ocfs2/dlmglue.c	2005-05-30 18:49:01 UTC (rev 2338)
@@ -23,6 +23,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>