Commit 7c809968 authored by Mark Rustad's avatar Mark Rustad Committed by Linus Torvalds

mm/page-writeback.c: use min3/max3 macros to avoid shadow warnings

Nested calls to min/max functions result in shadow warnings in W=2 builds.
 Avoid the warning by using the min3 and max3 macros to get the min/max of
3 values instead of nested calls.
Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ade3c99
...@@ -1075,13 +1075,13 @@ static void bdi_update_dirty_ratelimit(struct backing_dev_info *bdi, ...@@ -1075,13 +1075,13 @@ static void bdi_update_dirty_ratelimit(struct backing_dev_info *bdi,
} }
if (dirty < setpoint) { if (dirty < setpoint) {
x = min(bdi->balanced_dirty_ratelimit, x = min3(bdi->balanced_dirty_ratelimit,
min(balanced_dirty_ratelimit, task_ratelimit)); balanced_dirty_ratelimit, task_ratelimit);
if (dirty_ratelimit < x) if (dirty_ratelimit < x)
step = x - dirty_ratelimit; step = x - dirty_ratelimit;
} else { } else {
x = max(bdi->balanced_dirty_ratelimit, x = max3(bdi->balanced_dirty_ratelimit,
max(balanced_dirty_ratelimit, task_ratelimit)); balanced_dirty_ratelimit, task_ratelimit);
if (dirty_ratelimit > x) if (dirty_ratelimit > x)
step = dirty_ratelimit - x; step = dirty_ratelimit - x;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment