hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fat: fix parse_options() 

Current parse_options() exits too early.  We need to run the code of
bottom in this function even if users doesn't specify options.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
OGAWA Hirofumi 2008-07-25 01:46:41 -07:00 committed by Linus Torvalds
parent 3264d4ded4
commit 8d44d9741f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/fat/inode.c
View File

@ -950,7 +950,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
*debug = 0; *debug = 0;
if (!options) if (!options)
return 0; goto out;
while ((p = strsep(&options, ",")) != NULL) { while ((p = strsep(&options, ",")) != NULL) {
int token; int token;
@ -1104,10 +1104,13 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
return -EINVAL; return -EINVAL;
} }
} }
out:
/* UTF-8 doesn't provide FAT semantics */ /* UTF-8 doesn't provide FAT semantics */
if (!strcmp(opts->iocharset, "utf8")) { if (!strcmp(opts->iocharset, "utf8")) {
printk(KERN_ERR "FAT: utf8 is not a recommended IO charset" printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
" for FAT filesystems, filesystem will be case sensitive!\n"); " for FAT filesystems, filesystem will be "
"case sensitive!\n");
} }
/* If user doesn't specify allow_utime, it's initialized from dmask. */ /* If user doesn't specify allow_utime, it's initialized from dmask. */