From d1136ef95d7ab23a844c90f906ed9c734258773a Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Sun, 10 Mar 2013 21:55:19 +1100 Subject: [PATCH] kexec: Use min() and min_t() to simplify logic Simplify the logic of variable assignments. Signed-off-by: Zhang Yanfei Cc: "Eric W. Biederman" Reviewed-by: Simon Horman Cc: Joe Perches Signed-off-by: Andrew Morton --- kernel/kexec.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index b03db73f1c4c..404914d124cf 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -819,13 +819,9 @@ static int kimage_load_normal_segment(struct kimage *image, /* Start with a clear page */ clear_page(ptr); ptr += maddr & ~PAGE_MASK; - mchunk = PAGE_SIZE - (maddr & ~PAGE_MASK); - if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; - if (uchunk > ubytes) - uchunk = ubytes; + mchunk = min_t(size_t, mbytes, + (size_t)(PAGE_SIZE - (maddr & ~PAGE_MASK))); + uchunk = min_t(size_t, ubytes, mchunk); result = copy_from_user(ptr, buf, uchunk); kunmap(page); @@ -871,13 +867,10 @@ static int kimage_load_crash_segment(struct kimage *image, } ptr = kmap(page); ptr += maddr & ~PAGE_MASK; - mchunk = PAGE_SIZE - (maddr & ~PAGE_MASK); - if (mchunk > mbytes) - mchunk = mbytes; - - uchunk = mchunk; - if (uchunk > ubytes) { - uchunk = ubytes; + mchunk = min_t(size_t, mbytes, + (size_t)(PAGE_SIZE - (maddr & ~PAGE_MASK))); + uchunk = min_t(size_t, ubytes, mchunk); + if (mchunk > uchunk) { /* Zero the trailing part of the page */ memset(ptr + uchunk, 0, mchunk - uchunk); } @@ -1458,8 +1451,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - if (r + vmcoreinfo_size > vmcoreinfo_max_size) - r = vmcoreinfo_max_size - vmcoreinfo_size; + r = min_t(size_t, r, vmcoreinfo_max_size - vmcoreinfo_size); memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r); -- 2.39.5