Per previous discussions about cleaning up ufs_fs.h, people just want
this straight up dropped from userspace export. The only remaining
consumer (silo) has been fixed a while ago to not rely on this header.
This allows use to move it completely from include/linux/ to fs/ufs/
seeing as how the only in-kernel consumer is fs/ufs/.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 files changed:
-#include <linux/ufs_fs.h>
#include <linux/stat.h>
#include <linux/time.h>
#include <linux/string.h>
#include <linux/stat.h>
#include <linux/time.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
-#include <linux/ufs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <asm/byteorder.h>
#include <asm/byteorder.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include <linux/time.h>
#include <linux/fs.h>
#include <linux/time.h>
#include <linux/fs.h>
-#include <linux/ufs_fs.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
-#include <linux/ufs_fs.h>
#include <linux/buffer_head.h> /* for sync_mapping_buffers() */
#include <linux/buffer_head.h> /* for sync_mapping_buffers() */
-#include <linux/ufs_fs.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include <linux/bitops.h>
#include <asm/byteorder.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include <linux/errno.h>
#include <linux/fs.h>
#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>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/string.h>
#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include <linux/time.h>
#include <linux/fs.h>
#include <linux/time.h>
#include <linux/fs.h>
-#include <linux/ufs_fs.h>
#include <linux/smp_lock.h>
#include <linux/smp_lock.h>
#include "ufs.h"
#include "util.h"
#include "ufs.h"
#include "util.h"
#include <linux/errno.h>
#include <linux/fs.h>
#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>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/mount.h>
#include <linux/seq_file.h>
#include <linux/mount.h>
#include <linux/seq_file.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/fs.h>
#include <linux/namei.h>
-#include <linux/ufs_fs.h>
#include <linux/errno.h>
#include <linux/fs.h>
#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>
#include <linux/fcntl.h>
#include <linux/time.h>
#include <linux/stat.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
#include <linux/blkdev.h>
#include <linux/sched.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include <linux/stat.h>
#include <linux/fs.h>
#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;
#include <asm/div64.h>
typedef __u64 __bitwise __fs64;
typedef __u32 __bitwise __fs32;
typedef __u16 __bitwise __fs16;
#define UFS_BBLOCK 0
#define UFS_BBSIZE 8192
#define UFS_BBLOCK 0
#define UFS_BBSIZE 8192
*/
#define UFS_MINFREE 5
#define UFS_DEFAULTOPT UFS_OPTTIME
*/
#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.
/*
* Turn file system block numbers into disk block addresses.
* This maps file system blocks to device size blocks.
__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 */
__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 {
struct ufs_sb_private_info {
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/slab.h>
-#include <linux/ufs_fs.h>
#include <linux/buffer_head.h>
#include <linux/buffer_head.h>
#include "ufs.h"
#include "swab.h"
#include "util.h"
#include "ufs.h"
#include "swab.h"
#include "util.h"
unifdef-y += types.h
unifdef-y += udf_fs_i.h
unifdef-y += udp.h
unifdef-y += types.h
unifdef-y += udf_fs_i.h
unifdef-y += udp.h
unifdef-y += uinput.h
unifdef-y += uio.h
unifdef-y += unistd.h
unifdef-y += uinput.h
unifdef-y += uio.h
unifdef-y += unistd.h