diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/affs/affs.h | 1 | ||||
| -rw-r--r-- | fs/affs/super.c | 1 | ||||
| -rw-r--r-- | fs/autofs/autofs_i.h | 2 | ||||
| -rw-r--r-- | fs/autofs/inode.c | 1 | ||||
| -rw-r--r-- | fs/autofs4/autofs_i.h | 2 | ||||
| -rw-r--r-- | fs/autofs4/inode.c | 1 | ||||
| -rw-r--r-- | fs/hpfs/hpfs_fn.h | 1 | ||||
| -rw-r--r-- | fs/hpfs/super.c | 1 | ||||
| -rw-r--r-- | fs/openpromfs/inode.c | 2 |
9 files changed, 5 insertions, 7 deletions
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index 0ddd4cc0d1a0..1dc8438ef389 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h @@ -1,7 +1,6 @@ #include <linux/types.h> #include <linux/fs.h> #include <linux/buffer_head.h> -#include <linux/affs_fs.h> #include <linux/amigaffs.h> /* AmigaOS allows file names with up to 30 characters length. diff --git a/fs/affs/super.c b/fs/affs/super.c index 5200f4938df0..17352011ab67 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/statfs.h> #include <linux/parser.h> +#include <linux/magic.h> #include "affs.h" extern struct timezone sys_tz; diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index a62327f1bdff..c7700d9b3f96 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h @@ -37,8 +37,6 @@ #define DPRINTK(D) ((void)0) #endif -#define AUTOFS_SUPER_MAGIC 0x0187 - /* * If the daemon returns a negative response (AUTOFS_IOC_FAIL) then the * kernel will keep the negative response cached for up to the time given diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index 65e5ed42190e..af2efbbb5d76 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c @@ -16,6 +16,7 @@ #include <linux/file.h> #include <linux/parser.h> #include <linux/bitops.h> +#include <linux/magic.h> #include "autofs_i.h" #include <linux/module.h> diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index d6603d02304c..480ab178cba5 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -40,8 +40,6 @@ #define DPRINTK(fmt,args...) do {} while(0) #endif -#define AUTOFS_SUPER_MAGIC 0x0187 - /* Unified info structure. This is pointed to by both the dentry and inode structures. Each file in the filesystem has an instance of this structure. It holds a reference to the dentry, so dentries are never diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index fde78b110ddd..11a6a9ae51b7 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -19,6 +19,7 @@ #include <linux/parser.h> #include <linux/bitops.h> #include <linux/smp_lock.h> +#include <linux/magic.h> #include "autofs_i.h" #include <linux/module.h> diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h index f687d54ed442..32ab51e42b96 100644 --- a/fs/hpfs/hpfs_fn.h +++ b/fs/hpfs/hpfs_fn.h @@ -12,7 +12,6 @@ #include <linux/mutex.h> #include <linux/pagemap.h> #include <linux/buffer_head.h> -#include <linux/hpfs_fs.h> #include <linux/slab.h> #include <linux/smp_lock.h> diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c index f798480a363f..8fe51c343786 100644 --- a/fs/hpfs/super.c +++ b/fs/hpfs/super.c @@ -11,6 +11,7 @@ #include <linux/parser.h> #include <linux/init.h> #include <linux/statfs.h> +#include <linux/magic.h> /* Mark the filesystem dirty, so that chkdsk checks it when os/2 booted */ diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index 93a56bd4a2b7..592a6402e851 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c @@ -8,10 +8,10 @@ #include <linux/types.h> #include <linux/string.h> #include <linux/fs.h> -#include <linux/openprom_fs.h> #include <linux/init.h> #include <linux/slab.h> #include <linux/seq_file.h> +#include <linux/magic.h> #include <asm/openprom.h> #include <asm/oplib.h> |