[ros-diffs] [sedwards] 16835: some cleanups and I hope closer to making it work

some cleanups and I hope closer to making it work
Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.h
Modified: trunk/rosapps/sysutils/dosfsck/msdos_fs.h
  _____  

Modified: trunk/rosapps/sysutils/dosfsck/dosfsck.h
--- trunk/rosapps/sysutils/dosfsck/dosfsck.h	2005-07-28 18:45:58 UTC
(rev 16834)
+++ trunk/rosapps/sysutils/dosfsck/dosfsck.h	2005-07-28 18:53:35 UTC
(rev 16835)
@@ -18,10 +18,15 @@

 typedef unsigned int __u32;
 typedef unsigned __int64 __u64;
 typedef unsigned short __le16;
-typedef unsigned long  __le32;
+typedef unsigned int  __le32;
 typedef __int64 loff_t;
 typedef __int64 ll_t;
 
+#define CF_LE_W(v) (v)
+#define CF_LE_L(v) (v)
+#define CT_LE_W(v) (v)
+#define CT_LE_L(v) (v)
+
 #endif
 
 #define _LINUX_STAT_H		/* hack to avoid inclusion of
<linux/stat.h> */
@@ -34,17 +39,21 @@
 
 #include "msdos_fs.h"
 
+#if 0
 #undef CF_LE_W
 #undef CF_LE_L
 #undef CT_LE_W
 #undef CT_LE_L
+#endif
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 #include "byteswap.h"
+#if 0
 #define CF_LE_W(v) bswap_16(v)
 #define CF_LE_L(v) bswap_32(v)
 #define CT_LE_W(v) CF_LE_W(v)
 #define CT_LE_L(v) CF_LE_L(v)
+#endif
 #else
 #define CF_LE_W(v) (v)
 #define CF_LE_L(v) (v)
  _____  

Modified: trunk/rosapps/sysutils/dosfsck/msdos_fs.h
--- trunk/rosapps/sysutils/dosfsck/msdos_fs.h	2005-07-28 18:45:58 UTC
(rev 16834)
+++ trunk/rosapps/sysutils/dosfsck/msdos_fs.h	2005-07-28 18:53:35 UTC
(rev 16835)
@@ -12,12 +12,13 @@

 #define MSDOS_DPB_BITS	4		/* log2(MSDOS_DPB) */
 #define MSDOS_DPS	(SECTOR_SIZE / sizeof(struct msdos_dir_entry))
 #define MSDOS_DPS_BITS	4		/* log2(MSDOS_DPS) */
+#if 0
 #define CF_LE_W(v)	le16_to_cpu(v)
 #define CF_LE_L(v)	le32_to_cpu(v)
 #define CT_LE_W(v)	cpu_to_le16(v)
 #define CT_LE_L(v)	cpu_to_le32(v)
+#endif
 
-
 #define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
 
 #define MSDOS_ROOT_INO	1	/* == MINIX_ROOT_INO */
@@ -178,235 +179,4 @@
 	struct buffer_head *bh;
 };
 
-#ifdef __KERNEL__
-
-#include <linux/buffer_head.h>
-#include <linux/string.h>
-#include <linux/nls.h>
-#include <linux/fs.h>
-
-struct fat_mount_options {
-	uid_t fs_uid;
-	gid_t fs_gid;
-	unsigned short fs_fmask;
-	unsigned short fs_dmask;
-	unsigned short codepage;  /* Codepage for shortname conversions
*/
-	char *iocharset;          /* Charset used for filename
input/display */
-	unsigned short shortname; /* flags for shortname display/create
rule */
-	unsigned char name_check; /* r = relaxed, n = normal, s = strict
*/
-	unsigned quiet:1,         /* set = fake successful chmods and
chowns */
-		 showexec:1,      /* set = only set x bit for
com/exe/bat */
-		 sys_immutable:1, /* set = system files are immutable */
-		 dotsOK:1,        /* set = hidden and system files are
named '.filename' */
-		 isvfat:1,        /* 0=no vfat long filename support,
1=vfat support */
-		 utf8:1,	  /* Use of UTF8 character set (Default)
*/
-		 unicode_xlate:1, /* create escape sequences for
unhandled Unicode */
-		 numtail:1,       /* Does first alias have a numeric
'~1' type tail? */
-		 atari:1,         /* Use Atari GEMDOS variation of
MS-DOS fs */
-		 nocase:1;	  /* Does this need case conversion?
0=need case conversion*/
-};
-
-#define FAT_HASH_BITS	8
-#define FAT_HASH_SIZE	(1UL << FAT_HASH_BITS)
-#define FAT_HASH_MASK	(FAT_HASH_SIZE-1)
-
-/*
- * MS-DOS file system in-core superblock data
- */
-struct msdos_sb_info {
-	unsigned short sec_per_clus; /* sectors/cluster */
-	unsigned short cluster_bits; /* log2(cluster_size) */
-	unsigned int cluster_size;   /* cluster size */
-	unsigned char fats,fat_bits; /* number of FATs, FAT bits (12 or
16) */
-	unsigned short fat_start;
-	unsigned long fat_length;    /* FAT start & length (sec.) */
-	unsigned long dir_start;
-	unsigned short dir_entries;  /* root dir start & entries */
-	unsigned long data_start;    /* first data sector */
-	unsigned long max_cluster;   /* maximum cluster number */
-	unsigned long root_cluster;  /* first cluster of the root
directory */
-	unsigned long fsinfo_sector; /* sector number of FAT32 fsinfo */
-	struct semaphore fat_lock;
-	unsigned int prev_free;      /* previously allocated cluster
number */
-	unsigned int free_clusters;  /* -1 if undefined */
-	struct fat_mount_options options;
-	struct nls_table *nls_disk;  /* Codepage used on disk */
-	struct nls_table *nls_io;    /* Charset used for input and
display */
-	void *dir_ops;		     /* Opaque; default directory
operations */
-	int dir_per_block;	     /* dir entries per block */
-	int dir_per_block_bits;	     /* log2(dir_per_block) */
-
-	int fatent_shift;
-	struct fatent_operations *fatent_ops;
-
-	spinlock_t inode_hash_lock;
-	struct hlist_head inode_hashtable[FAT_HASH_SIZE];
-};
-
-#define FAT_CACHE_VALID	0	/* special case for valid cache
*/
-
-/*
- * MS-DOS file system inode data in memory
- */
-struct msdos_inode_info {
-	spinlock_t cache_lru_lock;
-	struct list_head cache_lru;
-	int nr_caches;
-	/* for avoiding the race between fat_free() and
fat_get_cluster() */
-	unsigned int cache_valid_id;
-
-	loff_t mmu_private;
-	int i_start;		/* first cluster or 0 */
-	int i_logstart;		/* logical first cluster */
-	int i_attrs;		/* unused attribute bits */
-	loff_t i_pos;		/* on-disk position of directory entry
or 0 */
-	struct hlist_node i_fat_hash;	/* hash by i_location */
-	struct inode vfs_inode;
-};
-
-static inline struct msdos_sb_info *MSDOS_SB(struct super_block *sb)
-{
-	return sb->s_fs_info;
-}
-
-static inline struct msdos_inode_info *MSDOS_I(struct inode *inode)
-{
-	return container_of(inode, struct msdos_inode_info, vfs_inode);
-}
-
-/* Return the FAT attribute byte for this inode */
-static inline u8 fat_attr(struct inode *inode)
-{
-	return ((inode->i_mode & S_IWUGO) ? ATTR_NONE : ATTR_RO) |
-		(S_ISDIR(inode->i_mode) ? ATTR_DIR : ATTR_NONE) |
-		MSDOS_I(inode)->i_attrs;
-}
-
-static inline sector_t fat_clus_to_blknr(struct msdos_sb_info *sbi, int
clus)
-{
-	return ((sector_t)clus - FAT_START_ENT) * sbi->sec_per_clus
-		+ sbi->data_start;
-}
-
-static inline void fat16_towchar(wchar_t *dst, const __u8 *src, size_t
len)
-{
-#ifdef __BIG_ENDIAN
-	while (len--) {
-		*dst++ = src[0] | (src[1] << 8);
-		src += 2;
-	}
-#else
-	memcpy(dst, src, len * 2);
 #endif
-}
-
-static inline void fatwchar_to16(__u8 *dst, const wchar_t *src, size_t
len)
-{
-#ifdef __BIG_ENDIAN
-	while (len--) {
-		dst[0] = *src & 0x00FF;
-		dst[1] = (*src & 0xFF00) >> 8;
-		dst += 2;
-		src++;
-	}
-#else
-	memcpy(dst, src, len * 2);
-#endif
-}
-
-/* fat/cache.c */
-extern void fat_cache_inval_inode(struct inode *inode);
-extern int fat_get_cluster(struct inode *inode, int cluster,
-			   int *fclus, int *dclus);
-extern int fat_bmap(struct inode *inode, sector_t sector, sector_t
*phys);
-
-/* fat/dir.c */
-extern struct file_operations fat_dir_operations;
-extern int fat_search_long(struct inode *inode, const unsigned char
*name,
-			   int name_len, struct fat_slot_info *sinfo);
-extern int fat_dir_empty(struct inode *dir);
-extern int fat_subdirs(struct inode *dir);
-extern int fat_scan(struct inode *dir, const unsigned char *name,
-		    struct fat_slot_info *sinfo);
-extern int fat_get_dotdot_entry(struct inode *dir, struct buffer_head
**bh,
-				struct msdos_dir_entry **de, loff_t
*i_pos);
-extern int fat_alloc_new_dir(struct inode *dir, struct timespec *ts);
-extern int fat_add_entries(struct inode *dir, void *slots, int
nr_slots,
-			   struct fat_slot_info *sinfo);
-extern int fat_remove_entries(struct inode *dir, struct fat_slot_info
*sinfo);
-
-/* fat/fatent.c */
-struct fat_entry {
-	int entry;
-	union {
-		u8 *ent12_p[2];
-		__le16 *ent16_p;
-		__le32 *ent32_p;
-	} u;
-	int nr_bhs;
-	struct buffer_head *bhs[2];
-};
-
-static inline void fatent_init(struct fat_entry *fatent)
-{
-	fatent->nr_bhs = 0;
-	fatent->entry = 0;
-	fatent->u.ent32_p = NULL;
-	fatent->bhs[0] = fatent->bhs[1] = NULL;
-}
-
-static inline void fatent_set_entry(struct fat_entry *fatent, int
entry)
-{
-	fatent->entry = entry;
-	fatent->u.ent32_p = NULL;
-}
-
-static inline void fatent_brelse(struct fat_entry *fatent)
-{
-	int i;
-	fatent->u.ent32_p = NULL;
-	for (i = 0; i < fatent->nr_bhs; i++)
-		brelse(fatent->bhs[i]);
-	fatent->nr_bhs = 0;
-	fatent->bhs[0] = fatent->bhs[1] = NULL;
-}
-
-extern void fat_ent_access_init(struct super_block *sb);
-extern int fat_ent_read(struct inode *inode, struct fat_entry *fatent,
-			int entry);
-extern int fat_ent_write(struct inode *inode, struct fat_entry *fatent,
-			 int new, int wait);
-extern int fat_alloc_clusters(struct inode *inode, int *cluster,
-			      int nr_cluster);
-extern int fat_free_clusters(struct inode *inode, int cluster);
-extern int fat_count_free_clusters(struct super_block *sb);
-
-/* fat/file.c */
-extern int fat_generic_ioctl(struct inode *inode, struct file *filp,
-			     unsigned int cmd, unsigned long arg);
-extern struct file_operations fat_file_operations;
-extern struct inode_operations fat_file_inode_operations;
-extern int fat_notify_change(struct dentry * dentry, struct iattr *
attr);
-extern void fat_truncate(struct inode *inode);
-
-/* fat/inode.c */
-extern void fat_attach(struct inode *inode, loff_t i_pos);
-extern void fat_detach(struct inode *inode);
-extern struct inode *fat_iget(struct super_block *sb, loff_t i_pos);
-extern struct inode *fat_build_inode(struct super_block *sb,
-			struct msdos_dir_entry *de, loff_t i_pos);
-extern int fat_sync_inode(struct inode *inode);
-extern int fat_fill_super(struct super_block *sb, void *data, int
silent,
-			struct inode_operations *fs_dir_inode_ops, int
isvfat);
-
-/* fat/misc.c */
-extern void fat_fs_panic(struct super_block *s, const char *fmt, ...);
-extern void fat_clusters_flush(struct super_block *sb);
-extern int fat_chain_add(struct inode *inode, int new_dclus, int
nr_cluster);
-extern int date_dos2unix(unsigned short time, unsigned short date);
-extern void fat_date_unix2dos(int unix_date, __le16 *time, __le16
*date);
-extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs);
-
-#endif /* __KERNEL__ */
-
-#endif