diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2014-01-05 20:58:27 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-01-28 16:20:17 -0500 |
| commit | e07a2ade4426a2cbafae4018aa7b6944bb627a6e (patch) | |
| tree | 7aebc7d70571ee40fb545dd8e85b492ad3b2da27 /fs | |
| parent | fc0ca9af180b91aad2fbf2fe3b16a12e1e05a760 (diff) | |
btrfs: Add nodiscard mount option.
Add nodiscard mount option to disable discard with remount option.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/super.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 44513f3fbdc1..e15377035dd5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -323,7 +323,7 @@ enum { | |||
| 323 | Opt_no_space_cache, Opt_recovery, Opt_skip_balance, | 323 | Opt_no_space_cache, Opt_recovery, Opt_skip_balance, |
| 324 | Opt_check_integrity, Opt_check_integrity_including_extent_data, | 324 | Opt_check_integrity, Opt_check_integrity_including_extent_data, |
| 325 | Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree, | 325 | Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree, |
| 326 | Opt_commit_interval, Opt_barrier, Opt_nodefrag, | 326 | Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard, |
| 327 | Opt_err, | 327 | Opt_err, |
| 328 | }; | 328 | }; |
| 329 | 329 | ||
| @@ -351,6 +351,7 @@ static match_table_t tokens = { | |||
| 351 | {Opt_flushoncommit, "flushoncommit"}, | 351 | {Opt_flushoncommit, "flushoncommit"}, |
| 352 | {Opt_ratio, "metadata_ratio=%d"}, | 352 | {Opt_ratio, "metadata_ratio=%d"}, |
| 353 | {Opt_discard, "discard"}, | 353 | {Opt_discard, "discard"}, |
| 354 | {Opt_nodiscard, "nodiscard"}, | ||
| 354 | {Opt_space_cache, "space_cache"}, | 355 | {Opt_space_cache, "space_cache"}, |
| 355 | {Opt_clear_cache, "clear_cache"}, | 356 | {Opt_clear_cache, "clear_cache"}, |
| 356 | {Opt_user_subvol_rm_allowed, "user_subvol_rm_allowed"}, | 357 | {Opt_user_subvol_rm_allowed, "user_subvol_rm_allowed"}, |
| @@ -575,6 +576,9 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
| 575 | case Opt_discard: | 576 | case Opt_discard: |
| 576 | btrfs_set_opt(info->mount_opt, DISCARD); | 577 | btrfs_set_opt(info->mount_opt, DISCARD); |
| 577 | break; | 578 | break; |
| 579 | case Opt_nodiscard: | ||
| 580 | btrfs_clear_opt(info->mount_opt, DISCARD); | ||
| 581 | break; | ||
| 578 | case Opt_space_cache: | 582 | case Opt_space_cache: |
| 579 | btrfs_set_opt(info->mount_opt, SPACE_CACHE); | 583 | btrfs_set_opt(info->mount_opt, SPACE_CACHE); |
| 580 | break; | 584 | break; |