Browse Source

vfat: change the default from shortname=lower to shortname=mixed

Because, with "shortname=lower", copying one FAT filesystem tree to
another FAT filesystem tree using Linux results in semantically
different filesystems. (E.g.: Filenames which were once "all
uppercase" are now "all lowercase").

So, this changes the default of "shortname=lower" to "shortname=mixed".

Signed-off-by: Paul Wise <pabs3@bonedaddy.net>
[change fat_show_options()]
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Paul Wise 16 years ago
parent
commit
955234755c
2 changed files with 3 additions and 3 deletions
  1. 1 1
      Documentation/filesystems/vfat.txt
  2. 2 2
      fs/fat/inode.c

+ 1 - 1
Documentation/filesystems/vfat.txt

@@ -102,7 +102,7 @@ shortname=lower|win95|winnt|mixed
 		 winnt: emulate the Windows NT rule for display/create.
 		 winnt: emulate the Windows NT rule for display/create.
 		 mixed: emulate the Windows NT rule for display,
 		 mixed: emulate the Windows NT rule for display,
 			emulate the Windows 95 rule for create.
 			emulate the Windows 95 rule for create.
-		 Default setting is `lower'.
+		 Default setting is `mixed'.
 
 
 tz=UTC        -- Interpret timestamps as UTC rather than local time.
 tz=UTC        -- Interpret timestamps as UTC rather than local time.
                  This option disables the conversion of timestamps
                  This option disables the conversion of timestamps

+ 2 - 2
fs/fat/inode.c

@@ -820,7 +820,7 @@ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt)
 			seq_puts(m, ",shortname=mixed");
 			seq_puts(m, ",shortname=mixed");
 			break;
 			break;
 		case VFAT_SFN_DISPLAY_LOWER | VFAT_SFN_CREATE_WIN95:
 		case VFAT_SFN_DISPLAY_LOWER | VFAT_SFN_CREATE_WIN95:
-			/* seq_puts(m, ",shortname=lower"); */
+			seq_puts(m, ",shortname=lower");
 			break;
 			break;
 		default:
 		default:
 			seq_puts(m, ",shortname=unknown");
 			seq_puts(m, ",shortname=unknown");
@@ -971,7 +971,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
 	opts->codepage = fat_default_codepage;
 	opts->codepage = fat_default_codepage;
 	opts->iocharset = fat_default_iocharset;
 	opts->iocharset = fat_default_iocharset;
 	if (is_vfat) {
 	if (is_vfat) {
-		opts->shortname = VFAT_SFN_DISPLAY_LOWER|VFAT_SFN_CREATE_WIN95;
+		opts->shortname = VFAT_SFN_DISPLAY_WINNT|VFAT_SFN_CREATE_WIN95;
 		opts->rodir = 0;
 		opts->rodir = 0;
 	} else {
 	} else {
 		opts->shortname = 0;
 		opts->shortname = 0;