From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U9Th4-0007aN-Mf for kexec@lists.infradead.org; Sun, 24 Feb 2013 05:00:12 +0000 Message-ID: <512990F4.3030203@cn.fujitsu.com> Date: Sun, 24 Feb 2013 12:03:00 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH] kexec: use min_t/max_t to avoid 'if (foo == bar)' thing 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 Cc: Simon Horman , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" This is just a tweak: using min_t/max_t to avoid `if (foo = bar)' thing. Cc: "Eric W. Biederman" Cc: Andrew Morton Cc: Simon Horman Signed-off-by: Zhang Yanfei --- kernel/kexec.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 2436ffc..065db87 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; + mchunk = min_t(size_t, mbytes, PAGE_SIZE - (maddr & ~PAGE_MASK)); + uchunk = min_t(size_t, ubytes, mchunk); if (uchunk > ubytes) { - uchunk = ubytes; /* 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750951Ab3BXFAH (ORCPT ); Sun, 24 Feb 2013 00:00:07 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:65410 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750761Ab3BXFAG (ORCPT ); Sun, 24 Feb 2013 00:00:06 -0500 X-IronPort-AV: E=Sophos;i="4.84,726,1355068800"; d="scan'208";a="6757004" Message-ID: <512990F4.3030203@cn.fujitsu.com> Date: Sun, 24 Feb 2013 12:03:00 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.8) Gecko/20121012 Thunderbird/10.0.8 MIME-Version: 1.0 To: "Eric W. Biederman" , Andrew Morton CC: Simon Horman , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] kexec: use min_t/max_t to avoid 'if (foo == bar)' thing X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/24 12:03:52, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/24 12:04:07, Serialize complete at 2013/02/24 12:04:07 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is just a tweak: using min_t/max_t to avoid `if (foo = bar)' thing. Cc: "Eric W. Biederman" Cc: Andrew Morton Cc: Simon Horman Signed-off-by: Zhang Yanfei --- kernel/kexec.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 2436ffc..065db87 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; + mchunk = min_t(size_t, mbytes, PAGE_SIZE - (maddr & ~PAGE_MASK)); + uchunk = min_t(size_t, ubytes, mchunk); if (uchunk > ubytes) { - uchunk = ubytes; /* 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