aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>2008-07-25 01:46:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 10:53:34 -0700
commit8d44d9741f6808c107a144f469fb89e6fe7c55e3 (patch)
tree8260a685c5eb6710a36991548d6cb9dbf31520c7 /fs
parent3264d4ded4d916d294d776b77b72d477c63ac3be (diff)
downloadlinux-2.6.34-ux500-8d44d9741f6808c107a144f469fb89e6fe7c55e3.tar.gz
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')
-rw-r--r--fs/fat/inode.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 46a4508ffd2..60deb5fd118 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,
*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. */