Merge bk://linuxvm.bkbits.net/linus-2.5 into cam.ac.uk:/usr/src/tng

4 files changed, 0 insertions, 189 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b3a0db2d093e..4192f77df84e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -651,7 +651,6 @@ struct quota_mount_options
 #include <linux/ext2_fs_sb.h>
 #include <linux/ext3_fs_sb.h>
 #include <linux/hpfs_fs_sb.h>
-#include <linux/ntfs_fs_sb.h>
 #include <linux/msdos_fs_sb.h>
 #include <linux/iso_fs_sb.h>
 #include <linux/nfs_fs_sb.h>
@@ -707,7 +706,6 @@ struct super_block {
 		struct ext2_sb_info	ext2_sb;
 		struct ext3_sb_info	ext3_sb;
 		struct hpfs_sb_info	hpfs_sb;
-		struct ntfs_sb_info	ntfs_sb;
 		struct msdos_sb_info	msdos_sb;
 		struct isofs_sb_info	isofs_sb;
 		struct nfs_sb_info	nfs_sb;
diff --git a/include/linux/ntfs_fs.h b/include/linux/ntfs_fs.h
deleted file mode 100644
index 2bac6f57866f..000000000000
--- a/include/linux/ntfs_fs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _LINUX_NTFS_FS_H
-#define _LINUX_NTFS_FS_H
-
-#include <asm/byteorder.h>
-
-#define NTFS_SECTOR_BITS 9
-#define NTFS_SECTOR_SIZE 512
-
-/*
- * Attribute flags (16-bit).
- */
-typedef enum {
-	ATTR_IS_COMPRESSED      = __constant_cpu_to_le16(0x0001),
-	ATTR_COMPRESSION_MASK   = __constant_cpu_to_le16(0x00ff),
-					/* Compression method mask. Also,
-					 * first illegal value. */
-	ATTR_IS_ENCRYPTED       = __constant_cpu_to_le16(0x4000),
-	ATTR_IS_SPARSE          = __constant_cpu_to_le16(0x8000),
-} __attribute__ ((__packed__)) ATTR_FLAGS;
-
-/*
- * The two zones from which to allocate clusters.
- */
-typedef enum {
-	MFT_ZONE,
-	DATA_ZONE
-} NTFS_CLUSTER_ALLOCATION_ZONES;
-
-#endif
diff --git a/include/linux/ntfs_fs_i.h b/include/linux/ntfs_fs_i.h
deleted file mode 100644
index 45420c0420af..000000000000
--- a/include/linux/ntfs_fs_i.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef _LINUX_NTFS_FS_I_H
-#define _LINUX_NTFS_FS_I_H
-
-#include <linux/types.h>
-
-/* Forward declarations, to keep number of mutual includes low */
-struct ntfs_attribute;
-struct ntfs_sb_info;
-
-/* Duplicate definitions from ntfs/ntfstypes.h */
-#ifndef NTFS_INTEGRAL_TYPES
-#define NTFS_INTEGRAL_TYPES
-typedef u8  ntfs_u8;
-typedef u16 ntfs_u16;
-typedef u32 ntfs_u32;
-typedef u64 ntfs_u64;
-typedef s8  ntfs_s8;
-typedef s16 ntfs_s16;
-typedef s32 ntfs_s32;
-typedef s64 ntfs_s64;
-#endif
-
-#ifndef NTMODE_T
-#define NTMODE_T
-typedef __kernel_mode_t ntmode_t;
-#endif
-#ifndef NTFS_UID_T
-#define NTFS_UID_T
-typedef uid_t ntfs_uid_t;
-#endif
-#ifndef NTFS_GID_T
-#define NTFS_GID_T
-typedef gid_t ntfs_gid_t;
-#endif
-#ifndef NTFS_SIZE_T
-#define NTFS_SIZE_T
-typedef __kernel_size_t ntfs_size_t;
-#endif
-#ifndef NTFS_TIME_T
-#define NTFS_TIME_T
-typedef __kernel_time_t ntfs_time_t;
-#endif
-
-/* unicode character type */
-#ifndef NTFS_WCHAR_T
-#define NTFS_WCHAR_T
-typedef u16 ntfs_wchar_t;
-#endif
-/* file offset */
-#ifndef NTFS_OFFSET_T
-#define NTFS_OFFSET_T
-typedef s64 ntfs_offset_t;
-#endif
-/* UTC */
-#ifndef NTFS_TIME64_T
-#define NTFS_TIME64_T
-typedef u64 ntfs_time64_t;
-#endif
-/*
- * This is really signed long long. So we support only volumes up to 2Tb. This
- * is ok as Win2k also only uses 32-bits to store clusters.
- * Whatever you do keep this a SIGNED value or a lot of NTFS users with
- * corrupted filesystems will lynch you! It causes massive fs corruption when
- * unsigned due to the nature of many checks relying on being performed on
- * signed quantities. (AIA)
- */
-#ifndef NTFS_CLUSTER_T
-#define NTFS_CLUSTER_T
-typedef s32 ntfs_cluster_t;
-#endif
-
-/* Definition of the NTFS in-memory inode structure. */
-struct ntfs_inode_info {
-	struct ntfs_sb_info *vol;
-	unsigned long i_number;		/* Should be really 48 bits. */
-	__u16 sequence_number;		/* The current sequence number. */
-	unsigned char *attr;		/* Array of the attributes. */
-	int attr_count;			/* Size of attrs[]. */
-	struct ntfs_attribute *attrs;
-	int record_count;		/* Size of records[]. */
-	int *records; /* Array of the record numbers of the $Mft whose 
-		       * attributes have been inserted in the inode. */
-	union {
-		struct {
-			int recordsize;
-			int clusters_per_record;
-		} index;
-	} u;	
-};
-
-/* this is a kludge */
-struct ntfs_i {
-	struct ntfs_inode_info n;
-	struct inode vfs_inode;
-};
-
-#endif
diff --git a/include/linux/ntfs_fs_sb.h b/include/linux/ntfs_fs_sb.h
deleted file mode 100644
index f86cfe93cac6..000000000000
--- a/include/linux/ntfs_fs_sb.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _LINUX_NTFS_FS_SB_H
-#define _LINUX_NTFS_FS_SB_H
-
-#include <linux/ntfs_fs_i.h>
-
-struct ntfs_sb_info{
-	/* Configuration provided by user at mount time. */
-	ntfs_uid_t uid;
-	ntfs_gid_t gid;
-	ntmode_t umask;
-	void *nls_map;
-	unsigned int ngt;
-	char mft_zone_multiplier;
-	unsigned long mft_data_pos;
-	ntfs_cluster_t mft_zone_pos;
-	ntfs_cluster_t mft_zone_start;
-	ntfs_cluster_t mft_zone_end;
-	ntfs_cluster_t data1_zone_pos;
-	ntfs_cluster_t data2_zone_pos;
-	/* Configuration provided by user with the ntfstools.
-	 * FIXME: This is no longer possible. What is this good for? (AIA) */
-	ntfs_size_t partition_bias;	/* For access to underlying device. */
-	/* Attribute definitions. */
-	ntfs_u32 at_standard_information;
-	ntfs_u32 at_attribute_list;
-	ntfs_u32 at_file_name;
-	ntfs_u32 at_volume_version;
-	ntfs_u32 at_security_descriptor;
-	ntfs_u32 at_volume_name;
-	ntfs_u32 at_volume_information;
-	ntfs_u32 at_data;
-	ntfs_u32 at_index_root;
-	ntfs_u32 at_index_allocation;
-	ntfs_u32 at_bitmap;
-	ntfs_u32 at_symlink; /* aka SYMBOLIC_LINK or REPARSE_POINT */
-	/* Data read / calculated from the boot file. */
-	int sector_size;
-	int cluster_size;
-	int cluster_size_bits;
-	int mft_clusters_per_record;
-	int mft_record_size;
-	int mft_record_size_bits;
-	int index_clusters_per_record;
-	int index_record_size;
-	int index_record_size_bits;
-	ntfs_cluster_t nr_clusters;
-	ntfs_cluster_t mft_lcn;
-	ntfs_cluster_t mft_mirr_lcn;
-	/* Data read from special files. */
-	unsigned char *mft;
-	unsigned short *upcase;
-	unsigned int upcase_length;
-	/* Inodes we always hold onto. */
-	struct ntfs_inode_info *mft_ino;
-	struct ntfs_inode_info *mftmirr;
-	struct ntfs_inode_info *bitmap;
-	struct super_block *sb;
-	unsigned char ino_flags;
-};
-
-#endif