diff options
| author | Seraphime Kirkovski <kirkseraph@gmail.com> | 2016-12-15 14:38:28 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-02-14 15:50:50 +0100 |
| commit | 50d0446e68fa0b687bd06288cc6cc25c475ab3fb (patch) | |
| tree | 2a5e37ace18e7a8134727ba803d745946f197c6d | |
| parent | 6b4df8b6c59fc865deb2650b60e38aca4c67a972 (diff) | |
| download | op-kernel-dev-50d0446e68fa0b687bd06288cc6cc25c475ab3fb.zip op-kernel-dev-50d0446e68fa0b687bd06288cc6cc25c475ab3fb.tar.gz | |
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 <kirkseraph@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/file-item.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/ioctl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index e97e322..42a97c9 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 21e51b0..03de93f 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); } } |
