diff options
author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2008-07-25 04:46:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:34 -0400 |
commit | 8d44d9741f6808c107a144f469fb89e6fe7c55e3 (patch) | |
tree | 8260a685c5eb6710a36991548d6cb9dbf31520c7 /fs/fat/inode.c | |
parent | 3264d4ded4d916d294d776b77b72d477c63ac3be (diff) |
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>
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 46a4508ffd2e..60deb5fd1188 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -950,7 +950,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug, | |||
950 | *debug = 0; | 950 | *debug = 0; |
951 | 951 | ||
952 | if (!options) | 952 | if (!options) |
953 | return 0; | 953 | goto out; |
954 | 954 | ||
955 | while ((p = strsep(&options, ",")) != NULL) { | 955 | while ((p = strsep(&options, ",")) != NULL) { |
956 | int token; | 956 | int token; |
@@ -1104,10 +1104,13 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug, | |||
1104 | return -EINVAL; | 1104 | return -EINVAL; |
1105 | } | 1105 | } |
1106 | } | 1106 | } |
1107 | |||
1108 | out: | ||
1107 | /* UTF-8 doesn't provide FAT semantics */ | 1109 | /* UTF-8 doesn't provide FAT semantics */ |
1108 | if (!strcmp(opts->iocharset, "utf8")) { | 1110 | if (!strcmp(opts->iocharset, "utf8")) { |
1109 | printk(KERN_ERR "FAT: utf8 is not a recommended IO charset" | 1111 | printk(KERN_ERR "FAT: utf8 is not a recommended IO charset" |
1110 | " for FAT filesystems, filesystem will be case sensitive!\n"); | 1112 | " for FAT filesystems, filesystem will be " |
1113 | "case sensitive!\n"); | ||
1111 | } | 1114 | } |
1112 | 1115 | ||
1113 | /* If user doesn't specify allow_utime, it's initialized from dmask. */ | 1116 | /* If user doesn't specify allow_utime, it's initialized from dmask. */ |