aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.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/volumes.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/volumes.c')
-rw-r--r--fs/btrfs/volumes.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index ed685991b2c1..1534a134750f 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -914,8 +914,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
914 printk(KERN_INFO "device fsid %pU ", disk_super->fsid); 914 printk(KERN_INFO "device fsid %pU ", disk_super->fsid);
915 } 915 }
916 916
917 printk(KERN_CONT "devid %llu transid %llu %s\n", 917 printk(KERN_CONT "devid %llu transid %llu %s\n", devid, transid, path);
918 (unsigned long long)devid, (unsigned long long)transid, path);
919 918
920 ret = device_list_add(path, disk_super, devid, fs_devices_ret); 919 ret = device_list_add(path, disk_super, devid, fs_devices_ret);
921 if (!ret && fs_devices_ret) 920 if (!ret && fs_devices_ret)
@@ -3159,7 +3158,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
3159 (bctl->data.target & ~allowed))) { 3158 (bctl->data.target & ~allowed))) {
3160 printk(KERN_ERR "btrfs: unable to start balance with target " 3159 printk(KERN_ERR "btrfs: unable to start balance with target "
3161 "data profile %llu\n", 3160 "data profile %llu\n",
3162 (unsigned long long)bctl->data.target); 3161 bctl->data.target);
3163 ret = -EINVAL; 3162 ret = -EINVAL;
3164 goto out; 3163 goto out;
3165 } 3164 }
@@ -3168,7 +3167,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
3168 (bctl->meta.target & ~allowed))) { 3167 (bctl->meta.target & ~allowed))) {
3169 printk(KERN_ERR "btrfs: unable to start balance with target " 3168 printk(KERN_ERR "btrfs: unable to start balance with target "
3170 "metadata profile %llu\n", 3169 "metadata profile %llu\n",
3171 (unsigned long long)bctl->meta.target); 3170 bctl->meta.target);
3172 ret = -EINVAL; 3171 ret = -EINVAL;
3173 goto out; 3172 goto out;
3174 } 3173 }
@@ -3177,7 +3176,7 @@ int btrfs_balance(struct btrfs_balance_control *bctl,
3177 (bctl->sys.target & ~allowed))) { 3176 (bctl->sys.target & ~allowed))) {
3178 printk(KERN_ERR "btrfs: unable to start balance with target " 3177 printk(KERN_ERR "btrfs: unable to start balance with target "
3179 "system profile %llu\n", 3178 "system profile %llu\n",
3180 (unsigned long long)bctl->sys.target); 3179 bctl->sys.target);
3181 ret = -EINVAL; 3180 ret = -EINVAL;
3182 goto out; 3181 goto out;
3183 } 3182 }
@@ -4652,8 +4651,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
4652 4651
4653 if (!em) { 4652 if (!em) {
4654 btrfs_crit(fs_info, "unable to find logical %llu len %llu", 4653 btrfs_crit(fs_info, "unable to find logical %llu len %llu",
4655 (unsigned long long)logical, 4654 logical, *length);
4656 (unsigned long long)*length);
4657 return -EINVAL; 4655 return -EINVAL;
4658 } 4656 }
4659 4657
@@ -5524,9 +5522,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio,
5524 5522
5525 if (map_length < length) { 5523 if (map_length < length) {
5526 btrfs_crit(root->fs_info, "mapping failed logical %llu bio len %llu len %llu", 5524 btrfs_crit(root->fs_info, "mapping failed logical %llu bio len %llu len %llu",
5527 (unsigned long long)logical, 5525 logical, length, map_length);
5528 (unsigned long long)length,
5529 (unsigned long long)map_length);
5530 BUG(); 5526 BUG();
5531 } 5527 }
5532 5528
@@ -5846,8 +5842,7 @@ static int read_one_dev(struct btrfs_root *root,
5846 return -EIO; 5842 return -EIO;
5847 5843
5848 if (!device) { 5844 if (!device) {
5849 btrfs_warn(root->fs_info, "devid %llu missing", 5845 btrfs_warn(root->fs_info, "devid %llu missing", devid);
5850 (unsigned long long)devid);
5851 device = add_missing_dev(root, devid, dev_uuid); 5846 device = add_missing_dev(root, devid, dev_uuid);
5852 if (!device) 5847 if (!device)
5853 return -ENOMEM; 5848 return -ENOMEM;