diff options
author | David Sterba <dsterba@suse.cz> | 2015-01-16 11:21:12 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2015-03-03 11:23:57 -0500 |
commit | f8c269d7223f6b63cc5936eb191bc3b170d24342 (patch) | |
tree | 2e82cc23da9f436bbb6fde058b3321619f990db2 /fs/btrfs/dev-replace.c | |
parent | 351810c1d2aafa288af61844d877941d516fb031 (diff) |
btrfs: cleanup 64bit/32bit divs, compile time constants
Switch to div_u64 if the divisor is a numeric constant or sum of
sizeof()s. We can remove a few instances of do_div that has the hidden
semtantics of changing the 1st argument.
Small power-of-two divisors are converted to bitshifts, large values are
kept intact for clarity.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r-- | fs/btrfs/dev-replace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 5ec03d999c37..0573848c7333 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -670,8 +670,8 @@ void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info, | |||
670 | case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED: | 670 | case BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED: |
671 | case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED: | 671 | case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED: |
672 | srcdev = dev_replace->srcdev; | 672 | srcdev = dev_replace->srcdev; |
673 | args->status.progress_1000 = div64_u64(dev_replace->cursor_left, | 673 | args->status.progress_1000 = div_u64(dev_replace->cursor_left, |
674 | div64_u64(btrfs_device_get_total_bytes(srcdev), 1000)); | 674 | div_u64(btrfs_device_get_total_bytes(srcdev), 1000)); |
675 | break; | 675 | break; |
676 | } | 676 | } |
677 | btrfs_dev_replace_unlock(dev_replace); | 677 | btrfs_dev_replace_unlock(dev_replace); |
@@ -806,7 +806,7 @@ static int btrfs_dev_replace_kthread(void *data) | |||
806 | btrfs_dev_replace_status(fs_info, status_args); | 806 | btrfs_dev_replace_status(fs_info, status_args); |
807 | progress = status_args->status.progress_1000; | 807 | progress = status_args->status.progress_1000; |
808 | kfree(status_args); | 808 | kfree(status_args); |
809 | do_div(progress, 10); | 809 | progress = div_u64(progress, 10); |
810 | printk_in_rcu(KERN_INFO | 810 | printk_in_rcu(KERN_INFO |
811 | "BTRFS: continuing dev_replace from %s (devid %llu) to %s @%u%%\n", | 811 | "BTRFS: continuing dev_replace from %s (devid %llu) to %s @%u%%\n", |
812 | dev_replace->srcdev->missing ? "<missing disk>" : | 812 | dev_replace->srcdev->missing ? "<missing disk>" : |