diff options
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 30c9a8ca2a54..bf0e84c75607 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -196,7 +196,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
196 | info->max_extent = max_t(u64, | 196 | info->max_extent = max_t(u64, |
197 | info->max_extent, root->sectorsize); | 197 | info->max_extent, root->sectorsize); |
198 | printk(KERN_INFO "btrfs: max_extent at %llu\n", | 198 | printk(KERN_INFO "btrfs: max_extent at %llu\n", |
199 | info->max_extent); | 199 | (unsigned long long)info->max_extent); |
200 | } | 200 | } |
201 | break; | 201 | break; |
202 | case Opt_max_inline: | 202 | case Opt_max_inline: |
@@ -211,7 +211,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
211 | root->sectorsize); | 211 | root->sectorsize); |
212 | } | 212 | } |
213 | printk(KERN_INFO "btrfs: max_inline at %llu\n", | 213 | printk(KERN_INFO "btrfs: max_inline at %llu\n", |
214 | info->max_inline); | 214 | (unsigned long long)info->max_inline); |
215 | } | 215 | } |
216 | break; | 216 | break; |
217 | case Opt_alloc_start: | 217 | case Opt_alloc_start: |
@@ -221,7 +221,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) | |||
221 | kfree(num); | 221 | kfree(num); |
222 | printk(KERN_INFO | 222 | printk(KERN_INFO |
223 | "btrfs: allocations start at %llu\n", | 223 | "btrfs: allocations start at %llu\n", |
224 | info->alloc_start); | 224 | (unsigned long long)info->alloc_start); |
225 | } | 225 | } |
226 | break; | 226 | break; |
227 | case Opt_noacl: | 227 | case Opt_noacl: |
@@ -420,11 +420,14 @@ static int btrfs_show_options(struct seq_file *seq, struct vfsmount *vfs) | |||
420 | if (btrfs_test_opt(root, NOBARRIER)) | 420 | if (btrfs_test_opt(root, NOBARRIER)) |
421 | seq_puts(seq, ",nobarrier"); | 421 | seq_puts(seq, ",nobarrier"); |
422 | if (info->max_extent != (u64)-1) | 422 | if (info->max_extent != (u64)-1) |
423 | seq_printf(seq, ",max_extent=%llu", info->max_extent); | 423 | seq_printf(seq, ",max_extent=%llu", |
424 | (unsigned long long)info->max_extent); | ||
424 | if (info->max_inline != 8192 * 1024) | 425 | if (info->max_inline != 8192 * 1024) |
425 | seq_printf(seq, ",max_inline=%llu", info->max_inline); | 426 | seq_printf(seq, ",max_inline=%llu", |
427 | (unsigned long long)info->max_inline); | ||
426 | if (info->alloc_start != 0) | 428 | if (info->alloc_start != 0) |
427 | seq_printf(seq, ",alloc_start=%llu", info->alloc_start); | 429 | seq_printf(seq, ",alloc_start=%llu", |
430 | (unsigned long long)info->alloc_start); | ||
428 | if (info->thread_pool_size != min_t(unsigned long, | 431 | if (info->thread_pool_size != min_t(unsigned long, |
429 | num_online_cpus() + 2, 8)) | 432 | num_online_cpus() + 2, 8)) |
430 | seq_printf(seq, ",thread_pool=%d", info->thread_pool_size); | 433 | seq_printf(seq, ",thread_pool=%d", info->thread_pool_size); |