aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 693a664318fe..1866dff0538e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -65,10 +65,9 @@ static void btrfs_put_super(struct super_block *sb)
65 65
66enum { 66enum {
67 Opt_degraded, Opt_subvol, Opt_subvolid, Opt_device, Opt_nodatasum, 67 Opt_degraded, Opt_subvol, Opt_subvolid, Opt_device, Opt_nodatasum,
68 Opt_nodatacow, Opt_max_extent, Opt_max_inline, Opt_alloc_start, 68 Opt_nodatacow, Opt_max_inline, Opt_alloc_start, Opt_nobarrier, Opt_ssd,
69 Opt_nobarrier, Opt_ssd, Opt_nossd, Opt_ssd_spread, Opt_thread_pool, 69 Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl, Opt_compress,
70 Opt_noacl, Opt_compress, Opt_compress_force, Opt_notreelog, Opt_ratio, 70 Opt_compress_force, Opt_notreelog, Opt_ratio, Opt_flushoncommit,
71 Opt_flushoncommit,
72 Opt_discard, Opt_err, 71 Opt_discard, Opt_err,
73}; 72};
74 73
@@ -80,7 +79,6 @@ static match_table_t tokens = {
80 {Opt_nodatasum, "nodatasum"}, 79 {Opt_nodatasum, "nodatasum"},
81 {Opt_nodatacow, "nodatacow"}, 80 {Opt_nodatacow, "nodatacow"},
82 {Opt_nobarrier, "nobarrier"}, 81 {Opt_nobarrier, "nobarrier"},
83 {Opt_max_extent, "max_extent=%s"},
84 {Opt_max_inline, "max_inline=%s"}, 82 {Opt_max_inline, "max_inline=%s"},
85 {Opt_alloc_start, "alloc_start=%s"}, 83 {Opt_alloc_start, "alloc_start=%s"},
86 {Opt_thread_pool, "thread_pool=%d"}, 84 {Opt_thread_pool, "thread_pool=%d"},
@@ -189,18 +187,6 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
189 info->thread_pool_size); 187 info->thread_pool_size);
190 } 188 }
191 break; 189 break;
192 case Opt_max_extent:
193 num = match_strdup(&args[0]);
194 if (num) {
195 info->max_extent = memparse(num, NULL);
196 kfree(num);
197
198 info->max_extent = max_t(u64,
199 info->max_extent, root->sectorsize);
200 printk(KERN_INFO "btrfs: max_extent at %llu\n",
201 (unsigned long long)info->max_extent);
202 }
203 break;
204 case Opt_max_inline: 190 case Opt_max_inline:
205 num = match_strdup(&args[0]); 191 num = match_strdup(&args[0]);
206 if (num) { 192 if (num) {
@@ -530,9 +516,6 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs)
530 seq_puts(seq, ",nodatacow"); 516 seq_puts(seq, ",nodatacow");
531 if (btrfs_test_opt(root, NOBARRIER)) 517 if (btrfs_test_opt(root, NOBARRIER))
532 seq_puts(seq, ",nobarrier"); 518 seq_puts(seq, ",nobarrier");
533 if (info->max_extent != (u64)-1)
534 seq_printf(seq, ",max_extent=%llu",
535 (unsigned long long)info->max_extent);
536 if (info->max_inline != 8192 * 1024) 519 if (info->max_inline != 8192 * 1024)
537 seq_printf(seq, ",max_inline=%llu", 520 seq_printf(seq, ",max_inline=%llu",
538 (unsigned long long)info->max_inline); 521 (unsigned long long)info->max_inline);