From 9fe9ad429684e996f15f201286d8880090820fe4 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rddunlap@osdl.org>
Date: Thu, 25 Sep 2003 18:46:24 -0700
Subject: [PATCH] [PATCH] janitor: intermezzo: clean up #includes

From: Randy Hron <rwhron@earthlink.net>

Remove duplicate #includes from fs/intermezzo.
---
 fs/intermezzo/dcache.c           | 1 -
 fs/intermezzo/dir.c              | 1 -
 fs/intermezzo/ext_attr.c         | 5 -----
 fs/intermezzo/file.c             | 1 -
 fs/intermezzo/inode.c            | 5 -----
 fs/intermezzo/intermezzo_psdev.h | 1 -
 fs/intermezzo/journal.c          | 1 -
 fs/intermezzo/journal_ext3.c     | 1 -
 fs/intermezzo/journal_reiserfs.c | 1 -
 fs/intermezzo/journal_tmpfs.c    | 1 -
 fs/intermezzo/presto.c           | 1 -
 fs/intermezzo/upcall.c           | 2 --
 12 files changed, 21 deletions(-)

diff --git a/fs/intermezzo/dcache.c b/fs/intermezzo/dcache.c
index 91cd4d94b5e66..9d62e71526679 100644
--- a/fs/intermezzo/dcache.c
+++ b/fs/intermezzo/dcache.c
@@ -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 --git a/fs/intermezzo/dir.c b/fs/intermezzo/dir.c
index b07d6ae8bb74f..ac6fe686e05ec 100644
--- a/fs/intermezzo/dir.c
+++ b/fs/intermezzo/dir.c
@@ -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 --git a/fs/intermezzo/ext_attr.c b/fs/intermezzo/ext_attr.c
index ea2ee20091662..14f0c4ca49d34 100644
--- a/fs/intermezzo/ext_attr.c
+++ b/fs/intermezzo/ext_attr.c
@@ -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 --git a/fs/intermezzo/file.c b/fs/intermezzo/file.c
index a1efcbfaa2c93..c8e6ab1166d97 100644
--- a/fs/intermezzo/file.c
+++ b/fs/intermezzo/file.c
@@ -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 --git a/fs/intermezzo/inode.c b/fs/intermezzo/inode.c
index a7328056310a2..f4721f1034a0c 100644
--- a/fs/intermezzo/inode.c
+++ b/fs/intermezzo/inode.c
@@ -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 --git a/fs/intermezzo/intermezzo_psdev.h b/fs/intermezzo/intermezzo_psdev.h
index e17f049d917f0..fff728ad8cf3a 100644
--- a/fs/intermezzo/intermezzo_psdev.h
+++ b/fs/intermezzo/intermezzo_psdev.h
@@ -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 --git a/fs/intermezzo/journal.c b/fs/intermezzo/journal.c
index 74396076f10dd..3a077cf099a36 100644
--- a/fs/intermezzo/journal.c
+++ b/fs/intermezzo/journal.c
@@ -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 --git a/fs/intermezzo/journal_ext3.c b/fs/intermezzo/journal_ext3.c
index c5180c307b4d9..edaab249c916b 100644
--- a/fs/intermezzo/journal_ext3.c
+++ b/fs/intermezzo/journal_ext3.c
@@ -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 --git a/fs/intermezzo/journal_reiserfs.c b/fs/intermezzo/journal_reiserfs.c
index 8ea2ec6bbe1ef..2a1d6c8c21ce5 100644
--- a/fs/intermezzo/journal_reiserfs.c
+++ b/fs/intermezzo/journal_reiserfs.c
@@ -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 --git a/fs/intermezzo/journal_tmpfs.c b/fs/intermezzo/journal_tmpfs.c
index 322da4af072ab..f2a81917cc490 100644
--- a/fs/intermezzo/journal_tmpfs.c
+++ b/fs/intermezzo/journal_tmpfs.c
@@ -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 --git a/fs/intermezzo/presto.c b/fs/intermezzo/presto.c
index 8b29fe3d053f6..a843df4ef9040 100644
--- a/fs/intermezzo/presto.c
+++ b/fs/intermezzo/presto.c
@@ -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 --git a/fs/intermezzo/upcall.c b/fs/intermezzo/upcall.c
index 7f9eac386b192..df86732f0208e 100644
--- a/fs/intermezzo/upcall.c
+++ b/fs/intermezzo/upcall.c
@@ -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"
-- 
2.53.0