msdos fs: remove unsettable atari option

PATCH In review René Scharfe 5 participants 9 messages May 25, 2008 – Jul 26, 2008

Share & tools

René Scharfe

author

2008-05-25 12:11 UTC #0 lore raw

PATCH 1/1 msdos fs: remove unsettable atari option

It has been impossible to set the option 'atari' of the MSDOS filesystem for several years. Since nobody seems to have missed it, let's remove its remains.

Signed-off-by Rene Scharfe <[email protected]>

---

 fs/msdos/namei.c         |   18 ++++++------------
 include/linux/msdos_fs.h |    1 -
 2 files changed, 6 insertions(+), 13 deletions(-)

fs/msdos/namei.c +6 ~~-12~~

index 05ff4f1..8240d22 100644
@@ -14,12 +14,7 @@
 
 /* Characters that are undesirable in an MS-DOS file name */
 static unsigned char bad_chars[] = "*?<>|\"";
-static unsigned char bad_if_strict_pc[] = "+=,; ";
-/* GEMDOS is less restrictive */
-static unsigned char bad_if_strict_atari[] = " ";
-
-#define bad_if_strict(opts) \
-	((opts)->atari ? bad_if_strict_atari : bad_if_strict_pc)
+static unsigned char bad_if_strict[] = "+=,; ";
 
 /***** Formats an MS-DOS file name. Rejects invalid names. */
 static int msdos_format_name(const unsigned char *name, int len,

@@ -40,21 +35,20 @@ static int msdos_format_name(const unsigned char *name, int len,
 			/* Get rid of dot - test for it elsewhere */
 			name++;
 			len--;
-		} else if (!opts->atari)
+		} else
 			return -EINVAL;
 	}
 	/*
-	 * disallow names that _really_ start with a dot for MS-DOS,
-	 * GEMDOS does not care
+	 * disallow names that _really_ start with a dot
 	 */
-	space = !opts->atari;
+	space = 1;
 	c = 0;
 	for (walk = res; len && walk - res < 8; walk++) {
 		c = *name++;
 		len--;
 		if (opts->name_check != 'r' && strchr(bad_chars, c))
 			return -EINVAL;
-		if (opts->name_check == 's' && strchr(bad_if_strict(opts), c))
+		if (opts->name_check == 's' && strchr(bad_if_strict, c))
 			return -EINVAL;
 		if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
 			return -EINVAL;

@@ -94,7 +88,7 @@ static int msdos_format_name(const unsigned char *name, int len,
 			if (opts->name_check != 'r' && strchr(bad_chars, c))
 				return -EINVAL;
 			if (opts->name_check == 's' &&
-			    strchr(bad_if_strict(opts), c))
+			    strchr(bad_if_strict, c))
 				return -EINVAL;
 			if (c < ' ' || c == ':' || c == '\\')
 				return -EINVAL;

include/linux/msdos_fs.h +0 -1

index b03b274..ceb5d16 100644
@@ -208,7 +208,6 @@ struct fat_mount_options {
 		 utf8:1,	  /* Use of UTF-8 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 */
 		 flush:1,	  /* write things quickly */
 		 nocase:1,	  /* Does this need case conversion? 0=need case conversion*/
 		 usefree:1;	  /* Use free_clusters for FAT32 */

OGAWA Hirofumi

Acked-by on v1 1/1

2008-05-25 15:42 UTC #1 lore raw

Quoted 6 lines · René Scharfe

It has been impossible to set the option 'atari' of the MSDOS filesystem for several years. Since nobody seems to have missed it, let's remove its remains.
Signed-off-by Rene Scharfe <[email protected]>
---

Looks good to me. Thanks.

Acked-by OGAWA Hirofumi <[email protected]>

Quoted 70 lines

 fs/msdos/namei.c         |   18 ++++++------------
 include/linux/msdos_fs.h |    1 -
 2 files changed, 6 insertions(+), 13 deletions(-)

fs/msdos/namei.c +6 ~~-12~~

index 05ff4f1..8240d22 100644
@@ -14,12 +14,7 @@
 
 /* Characters that are undesirable in an MS-DOS file name */
 static unsigned char bad_chars[] = "*?<>|\"";
-static unsigned char bad_if_strict_pc[] = "+=,; ";
-/* GEMDOS is less restrictive */
-static unsigned char bad_if_strict_atari[] = " ";
-
-#define bad_if_strict(opts) \
-	((opts)->atari ? bad_if_strict_atari : bad_if_strict_pc)
+static unsigned char bad_if_strict[] = "+=,; ";
 
 /***** Formats an MS-DOS file name. Rejects invalid names. */
 static int msdos_format_name(const unsigned char *name, int len,

@@ -40,21 +35,20 @@ static int msdos_format_name(const unsigned char *name, int len,
 			/* Get rid of dot - test for it elsewhere */
 			name++;
 			len--;
-		} else if (!opts->atari)
+		} else
 			return -EINVAL;
 	}
 	/*
-	 * disallow names that _really_ start with a dot for MS-DOS,
-	 * GEMDOS does not care
+	 * disallow names that _really_ start with a dot
 	 */
-	space = !opts->atari;
+	space = 1;
 	c = 0;
 	for (walk = res; len && walk - res < 8; walk++) {
 		c = *name++;
 		len--;
 		if (opts->name_check != 'r' && strchr(bad_chars, c))
 			return -EINVAL;
-		if (opts->name_check == 's' && strchr(bad_if_strict(opts), c))
+		if (opts->name_check == 's' && strchr(bad_if_strict, c))
 			return -EINVAL;
 		if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
 			return -EINVAL;

@@ -94,7 +88,7 @@ static int msdos_format_name(const unsigned char *name, int len,
 			if (opts->name_check != 'r' && strchr(bad_chars, c))
 				return -EINVAL;
 			if (opts->name_check == 's' &&
-			    strchr(bad_if_strict(opts), c))
+			    strchr(bad_if_strict, c))
 				return -EINVAL;
 			if (c < ' ' || c == ':' || c == '\\')
 				return -EINVAL;

include/linux/msdos_fs.h +0 -1

index b03b274..ceb5d16 100644
@@ -208,7 +208,6 @@ struct fat_mount_options {
 		 utf8:1,	  /* Use of UTF-8 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 */
 		 flush:1,	  /* write things quickly */
 		 nocase:1,	  /* Does this need case conversion? 0=need case conversion*/
 		 usefree:1;	  /* Use free_clusters for FAT32 */

Signature · 1 line

OGAWA Hirofumi <[email protected]>

Joseph Fannin

2008-06-01 22:10 UTC #2 lore raw

Quoted 6 lines · OGAWA Hirofumi

Quoted 4 lines · René Scharfe
It has been impossible to set the option 'atari' of the MSDOS filesystem for several years. Since nobody seems to have missed it, let's remove its remains.

Quoted 6 lines

Quoted 2 lines
Signed-off-by Rene Scharfe <[email protected]>
---
Looks good to me. Thanks.
Acked-by OGAWA Hirofumi <[email protected]>

Geert Uytterhoeven has a patch in his POSTPONED queue that is supposed to fix Atari FAT. I can't speak to whether it works or why it's postponed, but it seems to compile.

--
Joseph Fannin
[email protected]

OGAWA Hirofumi

2008-06-01 22:43 UTC #3 lore raw

Quoted 10 lines · Joseph Fannin

Quoted 9 lines · OGAWA Hirofumi
Quoted 6 lines · René Scharfe
It has been impossible to set the option 'atari' of the MSDOS filesystem for several years. Since nobody seems to have missed it, let's remove its remains.
Signed-off-by Rene Scharfe <[email protected]>
---

Quoted 7 lines

Quoted 3 lines
Looks good to me. Thanks.
Acked-by OGAWA Hirofumi <[email protected]>
Geert Uytterhoeven has a patch in his POSTPONED queue that is supposed to fix Atari FAT. I can't speak to whether it works or why it's postponed, but it seems to compile.

I see. Although I don't know the patch, I'd like to add this part to Geert's patch if possible. And when the patch can be posted, we can re-add this part again.

Geert, what do you think?

Signature · 1 line

OGAWA Hirofumi <[email protected]>

Geert Uytterhoeven

2008-06-02 07:34 UTC #4 lore raw

Quoted 19 lines · OGAWA Hirofumi

Quoted 10 lines · Joseph Fannin
Quoted 9 lines · OGAWA Hirofumi
Quoted 6 lines · Ren� Scharfe
It has been impossible to set the option 'atari' of the MSDOS filesystem for several years. Since nobody seems to have missed it, let's remove its remains.
Signed-off-by Rene Scharfe <[email protected]>
---
Quoted 7 lines
Quoted 3 lines
Looks good to me. Thanks.
Acked-by OGAWA Hirofumi <[email protected]>
Geert Uytterhoeven has a patch in his POSTPONED queue that is supposed to fix Atari FAT. I can't speak to whether it works or why it's postponed, but it seems to compile.

Quoted 5 lines

I see. Although I don't know the patch, I'd like to add this part to Geert's patch if possible. And when the patch can be posted, we can re-add this part again.
Geert, what do you think?

It's in POSTPONED state because nobody speaks up for/against it. Personally, I don't know how much it is (still) needed... But a few years ago somebody contacted me that he used it succesfully on PA-RISC and i386 ;-)

BTW, the patch is
http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/POSTPONED/134-atari-fat.diff

Atari people, I think now is the time to let it live or die...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Petr Stehlik

2008-06-02 11:21 UTC #5 lore raw

Quoted 14 lines · Geert Uytterhoeven

Quoted 8 lines
Quoted 3 lines
Geert Uytterhoeven has a patch in his POSTPONED queue that is supposed to fix Atari FAT. I can't speak to whether it works or why it's postponed, but it seems to compile.
I see. Although I don't know the patch, I'd like to add this part to Geert's patch if possible. And when the patch can be posted, we can re-add this part again.
Geert, what do you think?
It's in POSTPONED state because nobody speaks up for/against it. Personally, I don't know how much it is (still) needed... But a few years ago somebody contacted me that he used it succesfully on PA-RISC and i386 ;-)

Quoted 4 lines

BTW, the patch is
http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/POSTPONED/134-atari-fat.diff
Atari people, I think now is the time to let it live or die...

The patch looks good, how can I let it live?

Petr

OGAWA Hirofumi

2008-06-02 15:03 UTC #6 lore raw

Quoted 15 lines · Petr Stehlik

Quoted 14 lines · Geert Uytterhoeven
Quoted 8 lines
Quoted 3 lines
Geert Uytterhoeven has a patch in his POSTPONED queue that is supposed to fix Atari FAT. I can't speak to whether it works or why it's postponed, but it seems to compile.
I see. Although I don't know the patch, I'd like to add this part to Geert's patch if possible. And when the patch can be posted, we can re-add this part again.
Geert, what do you think?
It's in POSTPONED state because nobody speaks up for/against it. Personally, I don't know how much it is (still) needed... But a few years ago somebody contacted me that he used it succesfully on PA-RISC and i386 ;-)

Quoted 6 lines

Quoted 4 lines
BTW, the patch is
http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/POSTPONED/134-atari-fat.diff
Atari people, I think now is the time to let it live or die...
The patch looks good, how can I let it live?

Could you test whether it works well? If it works fine, I'll merge and clean it up. If it doesn't work, please fix it.

BTW,

+ if (sbi->fat_bits != 32 && total_clusters+2 > sbi->
+ fat_length*SECTOR_SIZE*8/sbi->fat_bits)
+ sbi->fat_bits = 12;

SECTOR_SIZE should be sb->s_blocksize? Or Atari doesn't support the sector size other than 512 bytes?

Thanks.

Signature · 1 line

OGAWA Hirofumi <[email protected]>

Geert Uytterhoeven

2008-07-26 15:28 UTC #7 lore raw

Quoted 19 lines · OGAWA Hirofumi

Quoted 18 lines · Petr Stehlik
Quoted 17 lines · Geert Uytterhoeven
Quoted 8 lines
Quoted 3 lines
Geert Uytterhoeven has a patch in his POSTPONED queue that is supposed to fix Atari FAT. I can't speak to whether it works or why it's postponed, but it seems to compile.
I see. Although I don't know the patch, I'd like to add this part to Geert's patch if possible. And when the patch can be posted, we can re-add this part again.
Geert, what do you think?
It's in POSTPONED state because nobody speaks up for/against it. Personally, I don't know how much it is (still) needed... But a few years ago somebody contacted me that he used it succesfully on PA-RISC and i386 ;-)
BTW, the patch is
http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-patches-2.6/POSTPONED/134-atari-fat.diff

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
Atari people, I think now is the time to let it live or die...
The patch looks good, how can I let it live?
Could you test whether it works well? If it works fine, I'll merge and clean it up. If it doesn't work, please fix it.

Petr, as there has been no further response anymore, it went into Linus' tree:

commit 7557bc66be629d19a402e752673708bfbb8b5e86
Author: Rene Scharfe <[email protected]>
Date: Fri Jul 25 01:46:45 2008 -0700

msdos fs: remove unsettable atari option

It has been impossible to set the option 'atari' of the MSDOS filesystem for several years. Since nobody seems to have missed it, let's remove its remains.

I'm inclined to drop it, if nobody seems to really care...

Quoted 8 lines

BTW,
(quoted diff) +3 -0
+		if (sbi->fat_bits != 32 && total_clusters+2 > sbi->
+			fat_length*SECTOR_SIZE*8/sbi->fat_bits)
+			sbi->fat_bits = 12;
SECTOR_SIZE should be sb->s_blocksize? Or Atari doesn't support the sector size other than 512 bytes?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

Petr Stehlík

2008-07-26 20:33 UTC #8 lore raw

Geert Uytterhoeven píše v So 26. 07. 2008 v 17:28 +0200:

Quoted 6 lines

Quoted 4 lines
Quoted 1 line
The patch looks good, how can I let it live?
Could you test whether it works well? If it works fine, I'll merge and clean it up. If it doesn't work, please fix it.
Petr, as there has been no further response anymore, it went into Linus' tree:

I know I should have checked that but I have been so overloaded at my regular job that I couldn't do anything with my FOSS projects or Atari, sorry.

Quoted 1 line

I'm inclined to drop it, if nobody seems to really care...

I can't care currently so feel free to drop it.

Quoted 8 lines

Quoted 8 lines
BTW,
(quoted diff) +3 -0
+		if (sbi->fat_bits != 32 && total_clusters+2 > sbi->
+			fat_length*SECTOR_SIZE*8/sbi->fat_bits)
+			sbi->fat_bits = 12;
SECTOR_SIZE should be sb->s_blocksize? Or Atari doesn't support the sector size other than 512 bytes?

I haven't seen floppies with > 512 sectors. Atari partitioned harddisks use much larger sectors (up to 32 kB), of course.

Petr