diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-08-20 07:20:07 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-09-01 08:16:08 -0400 |
commit | c1c9ff7c94e83fae89a742df74db51156869bad5 (patch) | |
tree | a931ebe1f410eba2a31ee78a2a24aa439f6e304f /fs/btrfs/disk-io.c | |
parent | 1cb048f596cc7b4405d695d65ca70098a7ab9065 (diff) |
Btrfs: Remove superfluous casts from u64 to unsigned long long
u64 is "unsigned long long" on all architectures now, so there's no need to
cast it when formatting it using the "ll" length modifier.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c60372de6647..5003466b00d2 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -303,9 +303,8 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, | |||
303 | printk_ratelimited(KERN_INFO "btrfs: %s checksum verify " | 303 | printk_ratelimited(KERN_INFO "btrfs: %s checksum verify " |
304 | "failed on %llu wanted %X found %X " | 304 | "failed on %llu wanted %X found %X " |
305 | "level %d\n", | 305 | "level %d\n", |
306 | root->fs_info->sb->s_id, | 306 | root->fs_info->sb->s_id, buf->start, |
307 | (unsigned long long)buf->start, val, found, | 307 | val, found, btrfs_header_level(buf)); |
308 | btrfs_header_level(buf)); | ||
309 | if (result != (char *)&inline_result) | 308 | if (result != (char *)&inline_result) |
310 | kfree(result); | 309 | kfree(result); |
311 | return 1; | 310 | return 1; |
@@ -346,9 +345,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, | |||
346 | } | 345 | } |
347 | printk_ratelimited("parent transid verify failed on %llu wanted %llu " | 346 | printk_ratelimited("parent transid verify failed on %llu wanted %llu " |
348 | "found %llu\n", | 347 | "found %llu\n", |
349 | (unsigned long long)eb->start, | 348 | eb->start, parent_transid, btrfs_header_generation(eb)); |
350 | (unsigned long long)parent_transid, | ||
351 | (unsigned long long)btrfs_header_generation(eb)); | ||
352 | ret = 1; | 349 | ret = 1; |
353 | clear_extent_buffer_uptodate(eb); | 350 | clear_extent_buffer_uptodate(eb); |
354 | out: | 351 | out: |
@@ -513,8 +510,7 @@ static int check_tree_block_fsid(struct btrfs_root *root, | |||
513 | #define CORRUPT(reason, eb, root, slot) \ | 510 | #define CORRUPT(reason, eb, root, slot) \ |
514 | printk(KERN_CRIT "btrfs: corrupt leaf, %s: block=%llu," \ | 511 | printk(KERN_CRIT "btrfs: corrupt leaf, %s: block=%llu," \ |
515 | "root=%llu, slot=%d\n", reason, \ | 512 | "root=%llu, slot=%d\n", reason, \ |
516 | (unsigned long long)btrfs_header_bytenr(eb), \ | 513 | btrfs_header_bytenr(eb), root->objectid, slot) |
517 | (unsigned long long)root->objectid, slot) | ||
518 | 514 | ||
519 | static noinline int check_leaf(struct btrfs_root *root, | 515 | static noinline int check_leaf(struct btrfs_root *root, |
520 | struct extent_buffer *leaf) | 516 | struct extent_buffer *leaf) |
@@ -614,14 +610,13 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, | |||
614 | if (found_start != eb->start) { | 610 | if (found_start != eb->start) { |
615 | printk_ratelimited(KERN_INFO "btrfs bad tree block start " | 611 | printk_ratelimited(KERN_INFO "btrfs bad tree block start " |
616 | "%llu %llu\n", | 612 | "%llu %llu\n", |
617 | (unsigned long long)found_start, | 613 | found_start, eb->start); |
618 | (unsigned long long)eb->start); | ||
619 | ret = -EIO; | 614 | ret = -EIO; |
620 | goto err; | 615 | goto err; |
621 | } | 616 | } |
622 | if (check_tree_block_fsid(root, eb)) { | 617 | if (check_tree_block_fsid(root, eb)) { |
623 | printk_ratelimited(KERN_INFO "btrfs bad fsid on block %llu\n", | 618 | printk_ratelimited(KERN_INFO "btrfs bad fsid on block %llu\n", |
624 | (unsigned long long)eb->start); | 619 | eb->start); |
625 | ret = -EIO; | 620 | ret = -EIO; |
626 | goto err; | 621 | goto err; |
627 | } | 622 | } |
@@ -2405,7 +2400,7 @@ int open_ctree(struct super_block *sb, | |||
2405 | if (features) { | 2400 | if (features) { |
2406 | printk(KERN_ERR "BTRFS: couldn't mount because of " | 2401 | printk(KERN_ERR "BTRFS: couldn't mount because of " |
2407 | "unsupported optional features (%Lx).\n", | 2402 | "unsupported optional features (%Lx).\n", |
2408 | (unsigned long long)features); | 2403 | features); |
2409 | err = -EINVAL; | 2404 | err = -EINVAL; |
2410 | goto fail_alloc; | 2405 | goto fail_alloc; |
2411 | } | 2406 | } |
@@ -2475,7 +2470,7 @@ int open_ctree(struct super_block *sb, | |||
2475 | if (!(sb->s_flags & MS_RDONLY) && features) { | 2470 | if (!(sb->s_flags & MS_RDONLY) && features) { |
2476 | printk(KERN_ERR "BTRFS: couldn't mount RDWR because of " | 2471 | printk(KERN_ERR "BTRFS: couldn't mount RDWR because of " |
2477 | "unsupported option features (%Lx).\n", | 2472 | "unsupported option features (%Lx).\n", |
2478 | (unsigned long long)features); | 2473 | features); |
2479 | err = -EINVAL; | 2474 | err = -EINVAL; |
2480 | goto fail_alloc; | 2475 | goto fail_alloc; |
2481 | } | 2476 | } |
@@ -3681,9 +3676,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf) | |||
3681 | if (transid != root->fs_info->generation) | 3676 | if (transid != root->fs_info->generation) |
3682 | WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, " | 3677 | WARN(1, KERN_CRIT "btrfs transid mismatch buffer %llu, " |
3683 | "found %llu running %llu\n", | 3678 | "found %llu running %llu\n", |
3684 | (unsigned long long)buf->start, | 3679 | buf->start, transid, root->fs_info->generation); |
3685 | (unsigned long long)transid, | ||
3686 | (unsigned long long)root->fs_info->generation); | ||
3687 | was_dirty = set_extent_buffer_dirty(buf); | 3680 | was_dirty = set_extent_buffer_dirty(buf); |
3688 | if (!was_dirty) | 3681 | if (!was_dirty) |
3689 | __percpu_counter_add(&root->fs_info->dirty_metadata_bytes, | 3682 | __percpu_counter_add(&root->fs_info->dirty_metadata_bytes, |