summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2014-06-27 16:50:31 -0500
committerChris Mason <clm@fb.com>2014-07-03 07:04:06 -0700
commit2aa06a35d06a34b3109bdbf1d653de1695dc8f12 (patch)
tree619b71c486c3c5097cb682a4c3553f7954287766 /fs
parent5f3164813b90f7dbcb5c3ab9006906222ce471b7 (diff)
downloadop-kernel-dev-2aa06a35d06a34b3109bdbf1d653de1695dc8f12.zip
op-kernel-dev-2aa06a35d06a34b3109bdbf1d653de1695dc8f12.tar.gz
btrfs: fix nossd and ssd_spread mount option regression
The commit 0780253 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: Roman Mamedov <rm@romanrm.net> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index b6ebde2..0927e46 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -522,9 +522,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
case Opt_ssd_spread:
btrfs_set_and_info(root, SSD_SPREAD,
"use spread ssd allocation scheme");
+ btrfs_set_opt(info->mount_opt, SSD);
break;
case Opt_nossd:
- btrfs_clear_and_info(root, NOSSD,
+ btrfs_set_and_info(root, NOSSD,
"not using ssd allocation scheme");
btrfs_clear_opt(info->mount_opt, SSD);
break;
OpenPOWER on IntegriCloud