From: Seraphime Kirkovski Date: Thu, 15 Dec 2016 13:38:28 +0000 (+0100) Subject: Btrfs: code cleanup min/max -> min_t/max_t X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=50d0446e68fa0b687bd06288cc6cc25c475ab3fb;p=linux.git Btrfs: code cleanup min/max -> min_t/max_t This cleans up the cases where the min/max macros were used with a cast rather than using directly min_t/max_t. Signed-off-by: Seraphime Kirkovski Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index e97e322c28f04..42a97c9103029 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -856,8 +856,8 @@ insert: tmp = min(tmp, (next_offset - file_key.offset) >> fs_info->sb->s_blocksize_bits); - tmp = max((u64)1, tmp); - tmp = min(tmp, (u64)MAX_CSUM_ITEMS(fs_info, csum_size)); + tmp = max_t(u64, 1, tmp); + tmp = min_t(u64, tmp, MAX_CSUM_ITEMS(fs_info, csum_size)); ins_size = csum_size * tmp; } else { ins_size = csum_size; diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 21e51b0ba188a..03de93f9a6aae 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -395,7 +395,7 @@ static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg) q = bdev_get_queue(device->bdev); if (blk_queue_discard(q)) { num_devices++; - minlen = min((u64)q->limits.discard_granularity, + minlen = min_t(u64, q->limits.discard_granularity, minlen); } }