aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2009-06-09 16:42:22 -0400
committerChris Mason <chris.mason@oracle.com>2009-06-10 11:29:50 -0400
commit3b30c22f64a6bb297719c60e494af1d26563f584 (patch)
tree2730226cb21de6c61f6d1fb265c64523e0073354
parentd644d8a1e30b88a93bcfb63cada2ae628462ddba (diff)
Btrfs: Add mount -o nossd
This allows you to turn off the ssd mode via remount. Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/super.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index e9ef8c3307fe..22855a18eb48 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -66,8 +66,8 @@ static void btrfs_put_super(struct super_block *sb)
66enum { 66enum {
67 Opt_degraded, Opt_subvol, Opt_device, Opt_nodatasum, Opt_nodatacow, 67 Opt_degraded, Opt_subvol, Opt_device, Opt_nodatasum, Opt_nodatacow,
68 Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, 68 Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier,
69 Opt_ssd, Opt_thread_pool, Opt_noacl, Opt_compress, Opt_notreelog, 69 Opt_ssd, Opt_nossd, Opt_thread_pool, Opt_noacl, Opt_compress,
70 Opt_ratio, Opt_flushoncommit, Opt_err, 70 Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_err,
71}; 71};
72 72
73static match_table_t tokens = { 73static match_table_t tokens = {
@@ -83,6 +83,7 @@ static match_table_t tokens = {
83 {Opt_thread_pool, "thread_pool=%d"}, 83 {Opt_thread_pool, "thread_pool=%d"},
84 {Opt_compress, "compress"}, 84 {Opt_compress, "compress"},
85 {Opt_ssd, "ssd"}, 85 {Opt_ssd, "ssd"},
86 {Opt_nossd, "nossd"},
86 {Opt_noacl, "noacl"}, 87 {Opt_noacl, "noacl"},
87 {Opt_notreelog, "notreelog"}, 88 {Opt_notreelog, "notreelog"},
88 {Opt_flushoncommit, "flushoncommit"}, 89 {Opt_flushoncommit, "flushoncommit"},
@@ -173,6 +174,10 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
173 printk(KERN_INFO "btrfs: use ssd allocation scheme\n"); 174 printk(KERN_INFO "btrfs: use ssd allocation scheme\n");
174 btrfs_set_opt(info->mount_opt, SSD); 175 btrfs_set_opt(info->mount_opt, SSD);
175 break; 176 break;
177 case Opt_nossd:
178 printk(KERN_INFO "btrfs: not using ssd allocation scheme\n");
179 btrfs_clear_opt(info->mount_opt, SSD);
180 break;
176 case Opt_nobarrier: 181 case Opt_nobarrier:
177 printk(KERN_INFO "btrfs: turning off barriers\n"); 182 printk(KERN_INFO "btrfs: turning off barriers\n");
178 btrfs_set_opt(info->mount_opt, NOBARRIER); 183 btrfs_set_opt(info->mount_opt, NOBARRIER);