[PATCH] janitor: remove unneeded includes (intermezzo)

Hi,
Please apply to 2.6.0-test5-current.
Thanks.


From: [email protected]
Subject: [Kernel-janitors] [PATCH] include cleanup of fs/intermezzo


Remove duplicate #includes from fs/intermezzo.
Test compiled on 2.6.0-test5-bk2.

diff -Nur linux-2.6.0-test5-bk2/fs/intermezzo/dcache.c linux/fs/intermezzo/dcache.c


 linux-260-test5-kj-rddunlap/fs/intermezzo/dcache.c           |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/dir.c              |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/ext_attr.c         |    5 -----
 linux-260-test5-kj-rddunlap/fs/intermezzo/file.c             |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/inode.c            |    5 -----
 linux-260-test5-kj-rddunlap/fs/intermezzo/intermezzo_psdev.h |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/journal.c          |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/journal_ext3.c     |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/journal_reiserfs.c |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/journal_tmpfs.c    |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/presto.c           |    1 -
 linux-260-test5-kj-rddunlap/fs/intermezzo/upcall.c           |    2 --
 12 files changed, 21 deletions(-)

diff -puN fs/intermezzo/dcache.c~fs_intermezzo_includes fs/intermezzo/dcache.c
--- linux-260-test5-kj/fs/intermezzo/dcache.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/dcache.c	2003-09-11 16:44:32.000000000 -0700
@@ -42,7 +42,6 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 
 #include "intermezzo_fs.h"
diff -puN fs/intermezzo/dir.c~fs_intermezzo_includes fs/intermezzo/dir.c
--- linux-260-test5-kj/fs/intermezzo/dir.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/dir.c	2003-09-11 16:44:32.000000000 -0700
@@ -37,7 +37,6 @@
 #include <linux/sched.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff -puN fs/intermezzo/ext_attr.c~fs_intermezzo_includes fs/intermezzo/ext_attr.c
--- linux-260-test5-kj/fs/intermezzo/ext_attr.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/ext_attr.c	2003-09-11 16:44:32.000000000 -0700
@@ -35,15 +35,10 @@
 #include <asm/uaccess.h>
 
 #include <linux/fs.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
 #include <linux/smp_lock.h>
-#include <linux/string.h>
-#include <asm/uaccess.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <asm/segment.h>
-#include <linux/smp_lock.h>
 
 #include "intermezzo_fs.h"
 #include "intermezzo_psdev.h"
diff -puN fs/intermezzo/file.c~fs_intermezzo_includes fs/intermezzo/file.c
--- linux-260-test5-kj/fs/intermezzo/file.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/file.c	2003-09-11 16:44:32.000000000 -0700
@@ -44,7 +44,6 @@
 #include <linux/smp_lock.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/module.h>
 
 #include <linux/fsfilter.h>
diff -puN fs/intermezzo/inode.c~fs_intermezzo_includes fs/intermezzo/inode.c
--- linux-260-test5-kj/fs/intermezzo/inode.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/inode.c	2003-09-11 16:44:32.000000000 -0700
@@ -37,11 +37,6 @@
 #include <asm/uaccess.h>
 
 #include <linux/fs.h>
-#include <linux/stat.h>
-#include <linux/errno.h>
-#include <linux/smp_lock.h>
-#include <linux/string.h>
-#include <asm/uaccess.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <asm/segment.h>
diff -puN fs/intermezzo/intermezzo_psdev.h~fs_intermezzo_includes fs/intermezzo/intermezzo_psdev.h
--- linux-260-test5-kj/fs/intermezzo/intermezzo_psdev.h~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/intermezzo_psdev.h	2003-09-11 16:44:32.000000000 -0700
@@ -8,7 +8,6 @@
 #define MAX_CHANNEL 16
 #define PROCNAME_SIZE 32
 #include <linux/smp_lock.h>
-#include <linux/smp_lock.h>
 
 /* represents state of an instance reached with /dev/intermezzo */
 /* communication pending & processing queues */
diff -puN fs/intermezzo/journal.c~fs_intermezzo_includes fs/intermezzo/journal.c
--- linux-260-test5-kj/fs/intermezzo/journal.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/journal.c	2003-09-11 16:44:32.000000000 -0700
@@ -37,7 +37,6 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 
 #include "intermezzo_fs.h"
 #include "intermezzo_psdev.h"
diff -puN fs/intermezzo/journal_ext3.c~fs_intermezzo_includes fs/intermezzo/journal_ext3.c
--- linux-260-test5-kj/fs/intermezzo/journal_ext3.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/journal_ext3.c	2003-09-11 16:44:32.000000000 -0700
@@ -37,7 +37,6 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #if defined(CONFIG_EXT3_FS) || defined (CONFIG_EXT3_FS_MODULE)
 #include <linux/jbd.h>
 #include <linux/ext3_fs.h>
diff -puN fs/intermezzo/journal_reiserfs.c~fs_intermezzo_includes fs/intermezzo/journal_reiserfs.c
--- linux-260-test5-kj/fs/intermezzo/journal_reiserfs.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/journal_reiserfs.c	2003-09-11 16:44:32.000000000 -0700
@@ -32,7 +32,6 @@
 #include <linux/stat.h>
 #include <linux/errno.h>
 #include <linux/smp_lock.h>
-#include <linux/smp_lock.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
diff -puN fs/intermezzo/journal_tmpfs.c~fs_intermezzo_includes fs/intermezzo/journal_tmpfs.c
--- linux-260-test5-kj/fs/intermezzo/journal_tmpfs.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/journal_tmpfs.c	2003-09-11 16:44:32.000000000 -0700
@@ -37,7 +37,6 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #if defined(CONFIG_TMPFS)
 #include <linux/jbd.h>
 #if defined(CONFIG_EXT3)
diff -puN fs/intermezzo/presto.c~fs_intermezzo_includes fs/intermezzo/presto.c
--- linux-260-test5-kj/fs/intermezzo/presto.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/presto.c	2003-09-11 16:44:32.000000000 -0700
@@ -35,7 +35,6 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 
 #include "intermezzo_fs.h"
 #include "intermezzo_psdev.h"
diff -puN fs/intermezzo/upcall.c~fs_intermezzo_includes fs/intermezzo/upcall.c
--- linux-260-test5-kj/fs/intermezzo/upcall.c~fs_intermezzo_includes	2003-09-11 16:44:32.000000000 -0700
+++ linux-260-test5-kj-rddunlap/fs/intermezzo/upcall.c	2003-09-11 16:44:32.000000000 -0700
@@ -42,8 +42,6 @@
 #include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <asm/uaccess.h>
-#include <linux/vmalloc.h>
-#include <asm/segment.h>
 
 #include "intermezzo_lib.h"
 #include "intermezzo_fs.h"

_


--
~Randy


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf