From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pa0-f43.google.com ([209.85.220.43]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U9cho-0003zc-Oe for kexec@lists.infradead.org; Sun, 24 Feb 2013 14:37:33 +0000 Received: by mail-pa0-f43.google.com with SMTP id bh2so1295550pad.2 for ; Sun, 24 Feb 2013 06:37:30 -0800 (PST) Message-ID: <512A25A1.4040002@gmail.com> Date: Sun, 24 Feb 2013 22:37:21 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH v2] kexec: Use min_t to simplify logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: "Eric W. Biederman" , Andrew Morton , Simon Horman Cc: "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" From: Zhang Yanfei This is just a tweak: using min_t to simplify logic of variable assignments. v2: - Rewrite patch description as Simon suggested. - Fix an inappropriate if test introduced by v1. Thanks Simon. Cc: "Eric W. Biederman" Cc: Andrew Morton Cc: Simon Horman Signed-off-by: Zhang Yanfei --- kernel/kexec.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 2436ffc..effd655 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -822,13 +822,8 @@ 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, PAGE_SIZE - (maddr & ~PAGE_MASK)); + uchunk = min_t(size_t, ubytes, mchunk); result = copy_from_user(ptr, buf, uchunk); kunmap(page); @@ -874,13 +869,9 @@ 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, 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); } @@ -1461,8 +1452,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); -- 1.7.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec