Commit 7557bc66 authored by Rene Scharfe's avatar Rene Scharfe Committed by Linus Torvalds

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: default avatarRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dcd8c53f
...@@ -14,12 +14,7 @@ ...@@ -14,12 +14,7 @@
/* Characters that are undesirable in an MS-DOS file name */ /* Characters that are undesirable in an MS-DOS file name */
static unsigned char bad_chars[] = "*?<>|\""; static unsigned char bad_chars[] = "*?<>|\"";
static unsigned char bad_if_strict_pc[] = "+=,; "; static unsigned char bad_if_strict[] = "+=,; ";
/* 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)
/***** Formats an MS-DOS file name. Rejects invalid names. */ /***** Formats an MS-DOS file name. Rejects invalid names. */
static int msdos_format_name(const unsigned char *name, int len, 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, ...@@ -40,21 +35,20 @@ static int msdos_format_name(const unsigned char *name, int len,
/* Get rid of dot - test for it elsewhere */ /* Get rid of dot - test for it elsewhere */
name++; name++;
len--; len--;
} else if (!opts->atari) } else
return -EINVAL; return -EINVAL;
} }
/* /*
* disallow names that _really_ start with a dot for MS-DOS, * disallow names that _really_ start with a dot
* GEMDOS does not care
*/ */
space = !opts->atari; space = 1;
c = 0; c = 0;
for (walk = res; len && walk - res < 8; walk++) { for (walk = res; len && walk - res < 8; walk++) {
c = *name++; c = *name++;
len--; len--;
if (opts->name_check != 'r' && strchr(bad_chars, c)) if (opts->name_check != 'r' && strchr(bad_chars, c))
return -EINVAL; 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; return -EINVAL;
if (c >= 'A' && c <= 'Z' && opts->name_check == 's') if (c >= 'A' && c <= 'Z' && opts->name_check == 's')
return -EINVAL; return -EINVAL;
...@@ -94,7 +88,7 @@ static int msdos_format_name(const unsigned char *name, int len, ...@@ -94,7 +88,7 @@ static int msdos_format_name(const unsigned char *name, int len,
if (opts->name_check != 'r' && strchr(bad_chars, c)) if (opts->name_check != 'r' && strchr(bad_chars, c))
return -EINVAL; return -EINVAL;
if (opts->name_check == 's' && if (opts->name_check == 's' &&
strchr(bad_if_strict(opts), c)) strchr(bad_if_strict, c))
return -EINVAL; return -EINVAL;
if (c < ' ' || c == ':' || c == '\\') if (c < ' ' || c == ':' || c == '\\')
return -EINVAL; return -EINVAL;
......
...@@ -201,7 +201,6 @@ struct fat_mount_options { ...@@ -201,7 +201,6 @@ struct fat_mount_options {
utf8:1, /* Use of UTF-8 character set (Default) */ utf8:1, /* Use of UTF-8 character set (Default) */
unicode_xlate:1, /* create escape sequences for unhandled Unicode */ unicode_xlate:1, /* create escape sequences for unhandled Unicode */
numtail:1, /* Does first alias have a numeric '~1' type tail? */ 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 */ flush:1, /* write things quickly */
nocase:1, /* Does this need case conversion? 0=need case conversion*/ nocase:1, /* Does this need case conversion? 0=need case conversion*/
usefree:1; /* Use free_clusters for FAT32 */ usefree:1; /* Use free_clusters for FAT32 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment