[PATCH] msdos fs: remove unsettable atari option

[PATCH] msdos fs: remove unsettable atari option

[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 <rene.scharfe@lsrfire.ath.cx>
---

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

diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c
index 05ff4f1..8240d22 100644
--- a/fs/msdos/namei.c
+++ b/fs/msdos/namei.c
@@ -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;
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
index b03b274..ceb5d16 100644
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
@@ -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 */

Re: [PATCH] msdos fs: remove unsettable atari option

[OGAWA Hirofumi]

René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:

> 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 <rene.scharfe@lsrfire.ath.cx>
> ---

Looks good to me. Thanks.

Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

>  fs/msdos/namei.c         |   18 ++++++------------
>  include/linux/msdos_fs.h |    1 -
>  2 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c
> index 05ff4f1..8240d22 100644
> --- a/fs/msdos/namei.c
> +++ b/fs/msdos/namei.c
> @@ -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;
> diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h
> index b03b274..ceb5d16 100644
> --- a/include/linux/msdos_fs.h
> +++ b/include/linux/msdos_fs.h
> @@ -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 <hirofumi@mail.parknet.co.jp>

Re: [PATCH] msdos fs: remove unsettable atari option

[Joseph Fannin]

On Mon, May 26, 2008 at 12:42:29AM +0900, OGAWA Hirofumi wrote:
> René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
>
> > 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 <rene.scharfe@lsrfire.ath.cx>
> > ---
>
> Looks good to me. Thanks.
>
> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

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
jfannin@gmail.com

Re: [PATCH] msdos fs: remove unsettable atari option

[OGAWA Hirofumi]

Joseph Fannin <jfannin@gmail.com> writes:

> On Mon, May 26, 2008 at 12:42:29AM +0900, OGAWA Hirofumi wrote:
>> René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
>>
>> > 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 <rene.scharfe@lsrfire.ath.cx>
>> > ---
>>
>> Looks good to me. Thanks.
>>
>> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
>
> 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?
-- 
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

Re: [PATCH] msdos fs: remove unsettable atari option

[Geert Uytterhoeven]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: TEXT/PLAIN; CHARSET=UTF-8, Size: 1658 bytes --]

On Mon, 2 Jun 2008, OGAWA Hirofumi wrote:
> Joseph Fannin <jfannin@gmail.com> writes:
> > On Mon, May 26, 2008 at 12:42:29AM +0900, OGAWA Hirofumi wrote:
> >> René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
> >>
> >> > 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 <rene.scharfe@lsrfire.ath.cx>
> >> > ---
> >>
> >> Looks good to me. Thanks.
> >>
> >> Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
> >
> > 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

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 -- geert@linux-m68k.org

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

Re: [PATCH] msdos fs: remove unsettable atari option

[Petr Stehlik]

Geert Uytterhoeven wrote:
>>> 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
> 
> 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

Re: [PATCH] msdos fs: remove unsettable atari option

[OGAWA Hirofumi]

Petr Stehlik <pstehlik@sophics.cz> writes:

> Geert Uytterhoeven wrote:
>>>> 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
>> 
>> 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.
-- 
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

Re: [PATCH] msdos fs: remove unsettable atari option

[Geert Uytterhoeven]

On Tue, 3 Jun 2008, OGAWA Hirofumi wrote:
> Petr Stehlik <pstehlik@sophics.cz> writes:
> > Geert Uytterhoeven wrote:
> >>>> 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
> >> 
> >> 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 <rene.scharfe@lsrfire.ath.cx>
    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...

> 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?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

Re: [PATCH] msdos fs: remove unsettable atari option

[Petr Stehlík]

Geert Uytterhoeven píše v So 26. 07. 2008 v 17:28 +0200:
> > > 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.

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

I can't care currently so feel free to drop 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?

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

Petr