The patch titled Subject: kexec: Use min() and min_t() to simplify logic has been added to the -mm tree. Its filename is kexec-use-min_t-to-simplify-logic.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Subject: kexec: Use min() and min_t() to simplify logic Simplify the logic of variable assignments. Signed-off-by: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Reviewed-by: Simon Horman <horms@xxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/kexec.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff -puN kernel/kexec.c~kexec-use-min_t-to-simplify-logic kernel/kexec.c --- a/kernel/kexec.c~kexec-use-min_t-to-simplify-logic +++ a/kernel/kexec.c @@ -819,13 +819,9 @@ static int kimage_load_normal_segment(st /* 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(str } 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 *f 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); _ Patches currently in -mm which might be from zhangyanfei@xxxxxxxxxxxxxx are origin.patch ipvs-change-type-of-netns_ipvs-sysctl_sync_qlen_max.patch fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication.patch fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix.patch fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix-fix.patch kexec-get-rid-of-duplicate-check-for-hole_end.patch kexec-prevent-double-free-on-image-allocation-failure.patch kexec-fix-memory-leak-in-function-kimage_normal_alloc.patch kexec-avoid-freeing-null-pointer-in-function-kimage_crash_alloc.patch kexec-fix-wrong-types-of-some-local-variables.patch kexec-use-min_t-to-simplify-logic.patch kexec-use-min_t-to-simplify-logic-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html