diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:29:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:29:26 -0500 |
commit | 337e4a1ab4d736b8c39a4c3a233ac21f1a6c036f (patch) | |
tree | 20c58600b42600b8f62f3cfb63fc62b1a7fbc78c /fs/fat/inode.c | |
parent | 7949456b1b96924c2d9ae5aea5fa7d4c81c946ed (diff) | |
parent | 681142f9211b23e6aa2984259d38b76d7bdc05a8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: make discard a mount option
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 76b7961ab663..14da530b05ca 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -858,6 +858,8 @@ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
858 | seq_puts(m, ",errors=panic"); | 858 | seq_puts(m, ",errors=panic"); |
859 | else | 859 | else |
860 | seq_puts(m, ",errors=remount-ro"); | 860 | seq_puts(m, ",errors=remount-ro"); |
861 | if (opts->discard) | ||
862 | seq_puts(m, ",discard"); | ||
861 | 863 | ||
862 | return 0; | 864 | return 0; |
863 | } | 865 | } |
@@ -871,7 +873,7 @@ enum { | |||
871 | Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes, | 873 | Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes, |
872 | Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes, | 874 | Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes, |
873 | Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont, | 875 | Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont, |
874 | Opt_err_panic, Opt_err_ro, Opt_err, | 876 | Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err, |
875 | }; | 877 | }; |
876 | 878 | ||
877 | static const match_table_t fat_tokens = { | 879 | static const match_table_t fat_tokens = { |
@@ -899,6 +901,7 @@ static const match_table_t fat_tokens = { | |||
899 | {Opt_err_cont, "errors=continue"}, | 901 | {Opt_err_cont, "errors=continue"}, |
900 | {Opt_err_panic, "errors=panic"}, | 902 | {Opt_err_panic, "errors=panic"}, |
901 | {Opt_err_ro, "errors=remount-ro"}, | 903 | {Opt_err_ro, "errors=remount-ro"}, |
904 | {Opt_discard, "discard"}, | ||
902 | {Opt_obsolate, "conv=binary"}, | 905 | {Opt_obsolate, "conv=binary"}, |
903 | {Opt_obsolate, "conv=text"}, | 906 | {Opt_obsolate, "conv=text"}, |
904 | {Opt_obsolate, "conv=auto"}, | 907 | {Opt_obsolate, "conv=auto"}, |
@@ -1136,6 +1139,9 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug, | |||
1136 | case Opt_rodir: | 1139 | case Opt_rodir: |
1137 | opts->rodir = 1; | 1140 | opts->rodir = 1; |
1138 | break; | 1141 | break; |
1142 | case Opt_discard: | ||
1143 | opts->discard = 1; | ||
1144 | break; | ||
1139 | 1145 | ||
1140 | /* obsolete mount options */ | 1146 | /* obsolete mount options */ |
1141 | case Opt_obsolate: | 1147 | case Opt_obsolate: |