Commit abce3154 authored by Hirofumi Ogawa's avatar Hirofumi Ogawa Committed by Linus Torvalds

[PATCH] remove the conv option of fat (1/3)

This removes the conv option. This option does nothing, now.
(This patch from René Scharfe)
parent ecf2c214
...@@ -255,8 +255,6 @@ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt) ...@@ -255,8 +255,6 @@ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt)
} }
if (opts->name_check != 'n') if (opts->name_check != 'n')
seq_printf(m, ",check=%c", opts->name_check); seq_printf(m, ",check=%c", opts->name_check);
if (opts->conversion != 'b')
seq_printf(m, ",conv=%c", opts->conversion);
if (opts->quiet) if (opts->quiet)
seq_puts(m, ",quiet"); seq_puts(m, ",quiet");
if (opts->showexec) if (opts->showexec)
...@@ -299,7 +297,6 @@ static int parse_options(char *options, int is_vfat, int *debug, ...@@ -299,7 +297,6 @@ static int parse_options(char *options, int is_vfat, int *debug,
else else
opts->shortname = 0; opts->shortname = 0;
opts->name_check = 'n'; opts->name_check = 'n';
opts->conversion = 'b';
opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0; opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0;
opts->utf8 = opts->unicode_xlate = 0; opts->utf8 = opts->unicode_xlate = 0;
opts->numtail = 1; opts->numtail = 1;
...@@ -326,15 +323,8 @@ static int parse_options(char *options, int is_vfat, int *debug, ...@@ -326,15 +323,8 @@ static int parse_options(char *options, int is_vfat, int *debug,
else ret = 0; else ret = 0;
} }
else if (!strcmp(this_char,"conv") && value) { else if (!strcmp(this_char,"conv") && value) {
if (value[0] && !value[1] && strchr("bta",*value)) printk("FAT: conv option is obsolete, "
opts->conversion = *value; "not supported now\n");
else if (!strcmp(value,"binary"))
opts->conversion = 'b';
else if (!strcmp(value,"text"))
opts->conversion = 't';
else if (!strcmp(value,"auto"))
opts->conversion = 'a';
else ret = 0;
} }
else if (!strcmp(this_char,"nocase")) { else if (!strcmp(this_char,"nocase")) {
if (!is_vfat) if (!is_vfat)
......
...@@ -17,18 +17,6 @@ ...@@ -17,18 +17,6 @@
#endif #endif
#define Printk(x) printk x #define Printk(x) printk x
/* Well-known binary file extensions - of course there are many more */
static char ascii_extensions[] =
"TXT" "ME " "HTM" "1ST" "LOG" " " /* text files */
"C " "H " "CPP" "LIS" "PAS" "FOR" /* programming languages */
"F " "MAK" "INC" "BAS" /* programming languages */
"BAT" "SH " /* program code :) */
"INI" /* config files */
"PBM" "PGM" "DXF" /* graphics */
"TEX"; /* TeX */
/* /*
* fat_fs_panic reports a severe file system problem and sets the file system * fat_fs_panic reports a severe file system problem and sets the file system
* read-only. The file system can be made writable again by remounting it. * read-only. The file system can be made writable again by remounting it.
...@@ -55,32 +43,6 @@ void fat_fs_panic(struct super_block *s, const char *fmt, ...) ...@@ -55,32 +43,6 @@ void fat_fs_panic(struct super_block *s, const char *fmt, ...)
printk(" File system has been set read-only\n"); printk(" File system has been set read-only\n");
} }
/*
* fat_is_binary selects optional text conversion based on the conversion mode
* and the extension part of the file name.
*/
int fat_is_binary(char conversion,char *extension)
{
char *walk;
switch (conversion) {
case 'b':
return 1;
case 't':
return 0;
case 'a':
for (walk = ascii_extensions; *walk; walk += 3)
if (!strncmp(extension,walk,3)) return 0;
return 1; /* default binary conversion */
default:
printk("Invalid conversion mode - defaulting to "
"binary.\n");
return 1;
}
}
void lock_fat(struct super_block *sb) void lock_fat(struct super_block *sb)
{ {
down(&(MSDOS_SB(sb)->fat_lock)); down(&(MSDOS_SB(sb)->fat_lock));
......
...@@ -299,7 +299,6 @@ extern int fat_notify_change(struct dentry * dentry, struct iattr * attr); ...@@ -299,7 +299,6 @@ extern int fat_notify_change(struct dentry * dentry, struct iattr * attr);
/* fat/misc.c */ /* fat/misc.c */
extern void fat_fs_panic(struct super_block *s, const char *fmt, ...); extern void fat_fs_panic(struct super_block *s, const char *fmt, ...);
extern int fat_is_binary(char conversion, char *extension);
extern void lock_fat(struct super_block *sb); extern void lock_fat(struct super_block *sb);
extern void unlock_fat(struct super_block *sb); extern void unlock_fat(struct super_block *sb);
extern void fat_clusters_flush(struct super_block *sb); extern void fat_clusters_flush(struct super_block *sb);
......
...@@ -15,7 +15,6 @@ struct fat_mount_options { ...@@ -15,7 +15,6 @@ struct fat_mount_options {
char *iocharset; /* Charset used for filename input/display */ char *iocharset; /* Charset used for filename input/display */
unsigned short shortname; /* flags for shortname display/create rule */ unsigned short shortname; /* flags for shortname display/create rule */
unsigned char name_check; /* r = relaxed, n = normal, s = strict */ unsigned char name_check; /* r = relaxed, n = normal, s = strict */
unsigned char conversion; /* b = binary, t = text, a = auto */
unsigned quiet:1, /* set = fake successful chmods and chowns */ unsigned quiet:1, /* set = fake successful chmods and chowns */
showexec:1, /* set = only set x bit for com/exe/bat */ showexec:1, /* set = only set x bit for com/exe/bat */
sys_immutable:1, /* set = system files are immutable */ sys_immutable:1, /* set = system files are immutable */
......
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