aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-08-20 07:20:07 -0400
committerChris Mason <chris.mason@fusionio.com>2013-09-01 08:16:08 -0400
commitc1c9ff7c94e83fae89a742df74db51156869bad5 (patch)
treea931ebe1f410eba2a31ee78a2a24aa439f6e304f /fs/btrfs/inode.c
parent1cb048f596cc7b4405d695d65ca70098a7ab9065 (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/inode.c')
-rw-r--r--fs/btrfs/inode.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 264feefa0290..21d8674f7837 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2786,8 +2786,7 @@ good:
2786zeroit: 2786zeroit:
2787 if (__ratelimit(&_rs)) 2787 if (__ratelimit(&_rs))
2788 btrfs_info(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u", 2788 btrfs_info(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u",
2789 (unsigned long long)btrfs_ino(page->mapping->host), 2789 btrfs_ino(page->mapping->host), start, csum, csum_expected);
2790 (unsigned long long)start, csum, csum_expected);
2791 memset(kaddr + offset, 1, end - start + 1); 2790 memset(kaddr + offset, 1, end - start + 1);
2792 flush_dcache_page(page); 2791 flush_dcache_page(page);
2793 kunmap_atomic(kaddr); 2792 kunmap_atomic(kaddr);
@@ -3572,8 +3571,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
3572 if (ret) { 3571 if (ret) {
3573 btrfs_info(root->fs_info, 3572 btrfs_info(root->fs_info,
3574 "failed to delete reference to %.*s, inode %llu parent %llu", 3573 "failed to delete reference to %.*s, inode %llu parent %llu",
3575 name_len, name, 3574 name_len, name, ino, dir_ino);
3576 (unsigned long long)ino, (unsigned long long)dir_ino);
3577 btrfs_abort_transaction(trans, root, ret); 3575 btrfs_abort_transaction(trans, root, ret);
3578 goto err; 3576 goto err;
3579 } 3577 }
@@ -6081,10 +6079,7 @@ insert:
6081 btrfs_release_path(path); 6079 btrfs_release_path(path);
6082 if (em->start > start || extent_map_end(em) <= start) { 6080 if (em->start > start || extent_map_end(em) <= start) {
6083 btrfs_err(root->fs_info, "bad extent! em: [%llu %llu] passed [%llu %llu]", 6081 btrfs_err(root->fs_info, "bad extent! em: [%llu %llu] passed [%llu %llu]",
6084 (unsigned long long)em->start, 6082 em->start, em->len, start, len);
6085 (unsigned long long)em->len,
6086 (unsigned long long)start,
6087 (unsigned long long)len);
6088 err = -EIO; 6083 err = -EIO;
6089 goto out; 6084 goto out;
6090 } 6085 }
@@ -6753,9 +6748,8 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
6753 flush_dcache_page(bvec->bv_page); 6748 flush_dcache_page(bvec->bv_page);
6754 if (csum != csums[index]) { 6749 if (csum != csums[index]) {
6755 btrfs_err(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u", 6750 btrfs_err(root->fs_info, "csum failed ino %llu off %llu csum %u expected csum %u",
6756 (unsigned long long)btrfs_ino(inode), 6751 btrfs_ino(inode), start, csum,
6757 (unsigned long long)start, 6752 csums[index]);
6758 csum, csums[index]);
6759 err = -EIO; 6753 err = -EIO;
6760 } 6754 }
6761 } 6755 }
@@ -6843,7 +6837,7 @@ static void btrfs_end_dio_bio(struct bio *bio, int err)
6843 if (err) { 6837 if (err) {
6844 printk(KERN_ERR "btrfs direct IO failed ino %llu rw %lu " 6838 printk(KERN_ERR "btrfs direct IO failed ino %llu rw %lu "
6845 "sector %#Lx len %u err no %d\n", 6839 "sector %#Lx len %u err no %d\n",
6846 (unsigned long long)btrfs_ino(dip->inode), bio->bi_rw, 6840 btrfs_ino(dip->inode), bio->bi_rw,
6847 (unsigned long long)bio->bi_sector, bio->bi_size, err); 6841 (unsigned long long)bio->bi_sector, bio->bi_size, err);
6848 dip->errors = 1; 6842 dip->errors = 1;
6849 6843
@@ -7775,7 +7769,7 @@ void btrfs_destroy_inode(struct inode *inode)
7775 if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM, 7769 if (test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
7776 &BTRFS_I(inode)->runtime_flags)) { 7770 &BTRFS_I(inode)->runtime_flags)) {
7777 btrfs_info(root->fs_info, "inode %llu still on the orphan list", 7771 btrfs_info(root->fs_info, "inode %llu still on the orphan list",
7778 (unsigned long long)btrfs_ino(inode)); 7772 btrfs_ino(inode));
7779 atomic_dec(&root->orphan_inodes); 7773 atomic_dec(&root->orphan_inodes);
7780 } 7774 }
7781 7775
@@ -7785,8 +7779,7 @@ void btrfs_destroy_inode(struct inode *inode)
7785 break; 7779 break;
7786 else { 7780 else {
7787 btrfs_err(root->fs_info, "found ordered extent %llu %llu on inode cleanup", 7781 btrfs_err(root->fs_info, "found ordered extent %llu %llu on inode cleanup",
7788 (unsigned long long)ordered->file_offset, 7782 ordered->file_offset, ordered->len);
7789 (unsigned long long)ordered->len);
7790 btrfs_remove_ordered_extent(inode, ordered); 7783 btrfs_remove_ordered_extent(inode, ordered);
7791 btrfs_put_ordered_extent(ordered); 7784 btrfs_put_ordered_extent(ordered);
7792 btrfs_put_ordered_extent(ordered); 7785 btrfs_put_ordered_extent(ordered);