diff options
| -rw-r--r-- | fs/ufs/balloc.c | 2 | ||||
| -rw-r--r-- | fs/ufs/cylinder.c | 2 | ||||
| -rw-r--r-- | fs/ufs/dir.c | 2 | ||||
| -rw-r--r-- | fs/ufs/file.c | 2 | ||||
| -rw-r--r-- | fs/ufs/ialloc.c | 2 | ||||
| -rw-r--r-- | fs/ufs/inode.c | 2 | ||||
| -rw-r--r-- | fs/ufs/namei.c | 3 | ||||
| -rw-r--r-- | fs/ufs/super.c | 2 | ||||
| -rw-r--r-- | fs/ufs/symlink.c | 3 | ||||
| -rw-r--r-- | fs/ufs/truncate.c | 2 | ||||
| -rw-r--r-- | fs/ufs/ufs_fs.h (renamed from include/linux/ufs_fs.h) | 10 | ||||
| -rw-r--r-- | fs/ufs/util.c | 2 | ||||
| -rw-r--r-- | include/linux/Kbuild | 1 |
13 files changed, 15 insertions, 20 deletions
diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index f63a09ce8683..1fca381f0ce2 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -9,7 +9,6 @@ */ #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/stat.h> #include <linux/time.h> #include <linux/string.h> @@ -19,6 +18,7 @@ #include <linux/bitops.h> #include <asm/byteorder.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/fs/ufs/cylinder.c b/fs/ufs/cylinder.c index 2a815665644f..b4676322ddb6 100644 --- a/fs/ufs/cylinder.c +++ b/fs/ufs/cylinder.c @@ -9,7 +9,6 @@ */ #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/time.h> #include <linux/stat.h> #include <linux/string.h> @@ -17,6 +16,7 @@ #include <asm/byteorder.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index aaf2878305ce..ef563fc8d72c 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -18,9 +18,9 @@ #include <linux/time.h> #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/swap.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/fs/ufs/file.c b/fs/ufs/file.c index a46c97bf023f..625ef17c6f83 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -24,9 +24,9 @@ */ #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/buffer_head.h> /* for sync_mapping_buffers() */ +#include "ufs_fs.h" #include "ufs.h" diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 7e260bc0d94f..ac181f6806a3 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -24,7 +24,6 @@ */ #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/time.h> #include <linux/stat.h> #include <linux/string.h> @@ -34,6 +33,7 @@ #include <linux/bitops.h> #include <asm/byteorder.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 489f26bc26d9..5446b888fc8e 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -30,7 +30,6 @@ #include <linux/errno.h> #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/time.h> #include <linux/stat.h> #include <linux/string.h> @@ -38,6 +37,7 @@ #include <linux/smp_lock.h> #include <linux/buffer_head.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c index 747a4de6c695..e3a9b1fac75a 100644 --- a/fs/ufs/namei.c +++ b/fs/ufs/namei.c @@ -29,8 +29,9 @@ #include <linux/time.h> #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/smp_lock.h> + +#include "ufs_fs.h" #include "ufs.h" #include "util.h" diff --git a/fs/ufs/super.c b/fs/ufs/super.c index d18ccf36ba34..85b22b5977fa 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -76,7 +76,6 @@ #include <linux/errno.h> #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/slab.h> #include <linux/time.h> #include <linux/stat.h> @@ -91,6 +90,7 @@ #include <linux/mount.h> #include <linux/seq_file.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/fs/ufs/symlink.c b/fs/ufs/symlink.c index 43ac10e75a4a..c0156eda44bc 100644 --- a/fs/ufs/symlink.c +++ b/fs/ufs/symlink.c @@ -27,7 +27,8 @@ #include <linux/fs.h> #include <linux/namei.h> -#include <linux/ufs_fs.h> + +#include "ufs_fs.h" #include "ufs.h" diff --git a/fs/ufs/truncate.c b/fs/ufs/truncate.c index 311ded34c2b2..41dd431ce228 100644 --- a/fs/ufs/truncate.c +++ b/fs/ufs/truncate.c @@ -36,7 +36,6 @@ #include <linux/errno.h> #include <linux/fs.h> -#include <linux/ufs_fs.h> #include <linux/fcntl.h> #include <linux/time.h> #include <linux/stat.h> @@ -46,6 +45,7 @@ #include <linux/blkdev.h> #include <linux/sched.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/include/linux/ufs_fs.h b/fs/ufs/ufs_fs.h index 10b854d3561f..54bde1895a80 100644 --- a/include/linux/ufs_fs.h +++ b/fs/ufs/ufs_fs.h @@ -35,16 +35,10 @@ #include <linux/stat.h> #include <linux/fs.h> -#ifndef __KERNEL__ -typedef __u64 __fs64; -typedef __u32 __fs32; -typedef __u16 __fs16; -#else #include <asm/div64.h> typedef __u64 __bitwise __fs64; typedef __u32 __bitwise __fs32; typedef __u16 __bitwise __fs16; -#endif #define UFS_BBLOCK 0 #define UFS_BBSIZE 8192 @@ -197,7 +191,7 @@ typedef __u16 __bitwise __fs16; */ #define UFS_MINFREE 5 #define UFS_DEFAULTOPT UFS_OPTTIME - + /* * Turn file system block numbers into disk block addresses. * This maps file system blocks to device size blocks. @@ -714,7 +708,7 @@ struct ufs_cg_private_info { __u32 c_clustersumoff;/* (u_int32) counts of avail clusters */ __u32 c_clusteroff; /* (u_int8) free cluster map */ __u32 c_nclusterblks; /* number of clusters this cg */ -}; +}; struct ufs_sb_private_info { diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 410084dae389..85a7fc9e4a4e 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c @@ -8,9 +8,9 @@ #include <linux/string.h> #include <linux/slab.h> -#include <linux/ufs_fs.h> #include <linux/buffer_head.h> +#include "ufs_fs.h" #include "ufs.h" #include "swab.h" #include "util.h" diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 2ebf068ba504..5cae9b5960ea 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -338,7 +338,6 @@ unifdef-y += tty.h unifdef-y += types.h unifdef-y += udf_fs_i.h unifdef-y += udp.h -unifdef-y += ufs_fs.h unifdef-y += uinput.h unifdef-y += uio.h unifdef-y += unistd.h |