From: Eric Sandeen <[email protected]> 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: Reported-by: Roman Mamedov <[email protected]> Signed-off-by: Eric Sandeen <[email protected]> Signed-off-by: Qu Wenruo <[email protected]> --- v2(By Qu): Make nossd disable ssd and ssd_spread. Add notes in Documentation/btrfs.txt --- Documentation/filesystems/btrfs.txt | 3 +++ fs/btrfs/super.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt index d11cc2f..f7d0878 100644 --- a/Documentation/filesystems/btrfs.txt +++ b/Documentation/filesystems/btrfs.txt @@ -201,6 +201,9 @@ Options with (*) are default options and will not show in the mount options. of unused space, and may perform better on low-end ssds. ssd_spread implies ssd, enabling all other ssd heuristics as well. + Option nossd removes all ssd allocation heuristics, disabling + ssd_spread or ssd mount option. + subvol=<path> Mount subvolume at <path> rather than the root subvolume. <path> is relative to the top level subvolume. diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 4662d92..cfe377a 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -522,10 +522,12 @@ 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_SPREAD); btrfs_clear_opt(info->mount_opt, SSD); break; case Opt_barrier: -- 2.0.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
