diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nilfs2/super.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 13b0e955c028..9da12211aac1 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
@@ -604,7 +604,7 @@ static const struct export_operations nilfs_export_ops = { | |||
604 | enum { | 604 | enum { |
605 | Opt_err_cont, Opt_err_panic, Opt_err_ro, | 605 | Opt_err_cont, Opt_err_panic, Opt_err_ro, |
606 | Opt_barrier, Opt_nobarrier, Opt_snapshot, Opt_order, Opt_norecovery, | 606 | Opt_barrier, Opt_nobarrier, Opt_snapshot, Opt_order, Opt_norecovery, |
607 | Opt_discard, Opt_err, | 607 | Opt_discard, Opt_nodiscard, Opt_err, |
608 | }; | 608 | }; |
609 | 609 | ||
610 | static match_table_t tokens = { | 610 | static match_table_t tokens = { |
@@ -617,6 +617,7 @@ static match_table_t tokens = { | |||
617 | {Opt_order, "order=%s"}, | 617 | {Opt_order, "order=%s"}, |
618 | {Opt_norecovery, "norecovery"}, | 618 | {Opt_norecovery, "norecovery"}, |
619 | {Opt_discard, "discard"}, | 619 | {Opt_discard, "discard"}, |
620 | {Opt_nodiscard, "nodiscard"}, | ||
620 | {Opt_err, NULL} | 621 | {Opt_err, NULL} |
621 | }; | 622 | }; |
622 | 623 | ||
@@ -676,6 +677,9 @@ static int parse_options(char *options, struct super_block *sb) | |||
676 | case Opt_discard: | 677 | case Opt_discard: |
677 | nilfs_set_opt(sbi, DISCARD); | 678 | nilfs_set_opt(sbi, DISCARD); |
678 | break; | 679 | break; |
680 | case Opt_nodiscard: | ||
681 | nilfs_clear_opt(sbi, DISCARD); | ||
682 | break; | ||
679 | default: | 683 | default: |
680 | printk(KERN_ERR | 684 | printk(KERN_ERR |
681 | "NILFS: Unrecognized mount option \"%s\"\n", p); | 685 | "NILFS: Unrecognized mount option \"%s\"\n", p); |