diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2017-03-31 17:19:04 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-04-11 18:48:59 +0200 |
| commit | 951e7966398b0fd6bacebec2d87ffd61c3f68b18 (patch) | |
| tree | d8f7bed7f9a8ee5b8c4b6ea34fcec7ecb6c944de /fs/btrfs/super.c | |
| parent | 41a75a6eb2bf4e75e0d93862171bebb3ca4efec7 (diff) | |
| download | linux-stable-951e7966398b0fd6bacebec2d87ffd61c3f68b18.tar.gz linux-stable-951e7966398b0fd6bacebec2d87ffd61c3f68b18.tar.bz2 linux-stable-951e7966398b0fd6bacebec2d87ffd61c3f68b18.zip | |
btrfs: drop the nossd flag when remounting with -o ssd
The opposite case was already handled right in the very next switch entry.
And also when turning on nossd, drop ssd_spread.
Reported-by: Hans van Kranenburg <hans.van.kranenburg@mendix.com>
Signed-off-by: Adam Borowski <kilobyte@angband.pl>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index da687dc79cce..9530a333d302 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -549,16 +549,19 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options, case Opt_ssd: btrfs_set_and_info(info, SSD, "use ssd allocation scheme"); + btrfs_clear_opt(info->mount_opt, NOSSD); break; case Opt_ssd_spread: btrfs_set_and_info(info, SSD_SPREAD, "use spread ssd allocation scheme"); btrfs_set_opt(info->mount_opt, SSD); + btrfs_clear_opt(info->mount_opt, NOSSD); break; case Opt_nossd: btrfs_set_and_info(info, NOSSD, "not using ssd allocation scheme"); btrfs_clear_opt(info->mount_opt, SSD); + btrfs_clear_opt(info->mount_opt, SSD_SPREAD); break; case Opt_barrier: btrfs_clear_and_info(info, NOBARRIER, |