diff options
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 57090b4284fe..4d5d0f3eb0d8 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -522,7 +522,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
522 | root->sectorsize); | 522 | root->sectorsize); |
523 | } | 523 | } |
524 | printk(KERN_INFO "btrfs: max_inline at %llu\n", | 524 | printk(KERN_INFO "btrfs: max_inline at %llu\n", |
525 | (unsigned long long)info->max_inline); | 525 | info->max_inline); |
526 | } else { | 526 | } else { |
527 | ret = -ENOMEM; | 527 | ret = -ENOMEM; |
528 | goto out; | 528 | goto out; |
@@ -537,7 +537,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
537 | kfree(num); | 537 | kfree(num); |
538 | printk(KERN_INFO | 538 | printk(KERN_INFO |
539 | "btrfs: allocations start at %llu\n", | 539 | "btrfs: allocations start at %llu\n", |
540 | (unsigned long long)info->alloc_start); | 540 | info->alloc_start); |
541 | } else { | 541 | } else { |
542 | ret = -ENOMEM; | 542 | ret = -ENOMEM; |
543 | goto out; | 543 | goto out; |
@@ -947,11 +947,9 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry) | |||
947 | if (btrfs_test_opt(root, NOBARRIER)) | 947 | if (btrfs_test_opt(root, NOBARRIER)) |
948 | seq_puts(seq, ",nobarrier"); | 948 | seq_puts(seq, ",nobarrier"); |
949 | if (info->max_inline != 8192 * 1024) | 949 | if (info->max_inline != 8192 * 1024) |
950 | seq_printf(seq, ",max_inline=%llu", | 950 | seq_printf(seq, ",max_inline=%llu", info->max_inline); |
951 | (unsigned long long)info->max_inline); | ||
952 | if (info->alloc_start != 0) | 951 | if (info->alloc_start != 0) |
953 | seq_printf(seq, ",alloc_start=%llu", | 952 | seq_printf(seq, ",alloc_start=%llu", info->alloc_start); |
954 | (unsigned long long)info->alloc_start); | ||
955 | if (info->thread_pool_size != min_t(unsigned long, | 953 | if (info->thread_pool_size != min_t(unsigned long, |
956 | num_online_cpus() + 2, 8)) | 954 | num_online_cpus() + 2, 8)) |
957 | seq_printf(seq, ",thread_pool=%d", info->thread_pool_size); | 955 | seq_printf(seq, ",thread_pool=%d", info->thread_pool_size); |