mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
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:
parent
3264d4ded4
commit
8d44d9741f
1 changed files with 5 additions and 2 deletions
|
@ -950,7 +950,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
|
|||
*debug = 0;
|
||||
|
||||
if (!options)
|
||||
return 0;
|
||||
goto out;
|
||||
|
||||
while ((p = strsep(&options, ",")) != NULL) {
|
||||
int token;
|
||||
|
@ -1104,10 +1104,13 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
|
|||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
out:
|
||||
/* UTF-8 doesn't provide FAT semantics */
|
||||
if (!strcmp(opts->iocharset, "utf8")) {
|
||||
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. */
|
||||
|
|
Loading…
Reference in a new issue