From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
The low byte of FAT's first entry must have same value with media-field.
So, I added that validity check for some case. In fact, in some case
this check detected non-FAT filesystem. But in real world,
unfortunately too many devices is writing a wrong value.
This patch removes that validity check.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
---
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/fat/inode.c | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff -puN fs/fat/inode.c~fat-remove-validity-check-of-fat-first-entry fs/fat/inode.c
--- 25/fs/fat/inode.c~fat-remove-validity-check-of-fat-first-entry 2004-09-25 22:06:10.087962040 -0700
+++ 25-akpm/fs/fat/inode.c 2004-09-25 22:06:10.092961280 -0700
@@ -804,7 +804,7 @@ int fat_fill_super(struct super_block *s
struct msdos_sb_info *sbi;
u16 logical_sector_size;
u32 total_sectors, total_clusters, fat_clusters, rootdir_sectors;
- int debug, first;
+ int debug;
unsigned int media;
long error;
char buf[50];
@@ -1005,27 +1005,13 @@ int fat_fill_super(struct super_block *s
brelse(bh);
- /* validity check of FAT */
- first = __fat_access(sb, 0, -1);
- if (first < 0) {
- error = first;
- goto out_fail;
- }
- if (FAT_FIRST_ENT(sb, media) == first) {
- /* all is as it should be */
- } else if (media == 0xf8 && FAT_FIRST_ENT(sb, 0xfe) == first) {
- /* bad, reported on pc9800 */
- } else if (media == 0xf0 && FAT_FIRST_ENT(sb, 0xf8) == first) {
- /* bad, reported with a MO disk on win95/me */
- } else if (first == 0) {
- /* bad, reported with a SmartMedia card */
- } else {
- if (!silent)
- printk(KERN_ERR "FAT: invalid first entry of FAT "
- "(0x%x != 0x%x)\n",
- FAT_FIRST_ENT(sb, media), first);
- goto out_invalid;
- }
+ /*
+ * The low byte of FAT's first entry must have same value with
+ * media-field. But in real world, too many devices is
+ * writing wrong value. So, removed that validity check.
+ *
+ * if (FAT_FIRST_ENT(sb, media) != first)
+ */
error = -EINVAL;
sprintf(buf, "cp%d", sbi->options.codepage);
_