Commit 2aa06a35 authored by Eric Sandeen's avatar Eric Sandeen Committed by Chris Mason

btrfs: fix nossd and ssd_spread mount option regression

The commit

07802534 btrfs: Cleanup the btrfs_parse_options for remount.

broke ssd options quite badly; it stopped making ssd_spread
imply ssd, and it made "nossd" unsettable.

Put things back at least as well as they were before
(though ssd mount option handling is still pretty odd:
# mount -o "nossd,ssd_spread" works?)
Reported-by: default avatarRoman Mamedov <rm@romanrm.net>
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 5f316481
...@@ -522,9 +522,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) ...@@ -522,9 +522,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
case Opt_ssd_spread: case Opt_ssd_spread:
btrfs_set_and_info(root, SSD_SPREAD, btrfs_set_and_info(root, SSD_SPREAD,
"use spread ssd allocation scheme"); "use spread ssd allocation scheme");
btrfs_set_opt(info->mount_opt, SSD);
break; break;
case Opt_nossd: case Opt_nossd:
btrfs_clear_and_info(root, NOSSD, btrfs_set_and_info(root, NOSSD,
"not using ssd allocation scheme"); "not using ssd allocation scheme");
btrfs_clear_opt(info->mount_opt, SSD); btrfs_clear_opt(info->mount_opt, SSD);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment