From: Andrew Morton <akpm@linux-foundation.org>
To: Zhang Yanfei <zhangyanfei.yes@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
benh@kernel.crashing.org, mahesh@linux.vnet.ibm.com,
zhangyanfei@cn.fujitsu.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] fs/proc/vmcore.c: Put if tests in the top of the while loop to reduce duplication
Date: Thu, 7 Feb 2013 16:06:20 -0800 [thread overview]
Message-ID: <20130207160620.6c8f93d4.akpm@linux-foundation.org> (raw)
In-Reply-To: <510E6280.3070203@gmail.com>
On Sun, 03 Feb 2013 21:13:36 +0800
Zhang Yanfei <zhangyanfei.yes@gmail.com> wrote:
> From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
>
> In function read_vmcore, two if tests are duplicate. Change the position
> of them could reduce the duplication. This change does not affect
> the behaviour of the function.
>
hm, yes.
> --- a/fs/proc/vmcore.c
> +++ b/fs/proc/vmcore.c
> @@ -175,15 +175,16 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
> start = map_offset_to_paddr(*fpos, &vmcore_list, &curr_m);
> if (!curr_m)
> return -EINVAL;
> - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
> - tsz = buflen;
> -
> - /* Calculate left bytes in current memory segment. */
> - nr_bytes = (curr_m->size - (start - curr_m->paddr));
> - if (tsz > nr_bytes)
> - tsz = nr_bytes;
>
> while (buflen) {
> + if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
> + tsz = buflen;
> +
> + /* Calculate left bytes in current memory segment. */
> + nr_bytes = (curr_m->size - (start - curr_m->paddr));
> + if (tsz > nr_bytes)
> + tsz = nr_bytes;
> +
> tmp = read_from_oldmem(buffer, tsz, &start, 1);
> if (tmp < 0)
> return tmp;
> @@ -198,12 +199,6 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
> struct vmcore, list);
> start = curr_m->paddr;
`start' gets changed here
> }
> - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
> - tsz = buflen;
> - /* Calculate left bytes in current memory segment. */
> - nr_bytes = (curr_m->size - (start - curr_m->paddr));
> - if (tsz > nr_bytes)
> - tsz = nr_bytes;
So this code can calcualte a different value of `tsz'. But that won't
get used. Looks right to me.
> }
> return acc;
> }
While we're there, let's squish that assignment-in-a-if pestilence and
use max_t().
--- a/fs/proc/vmcore.c~fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix
+++ a/fs/proc/vmcore.c
@@ -178,8 +178,7 @@ static ssize_t read_vmcore(struct file *
return -EINVAL;
while (buflen) {
- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
- tsz = buflen;
+ tsz = max_t(size_t, buflen, PAGE_SIZE - (start & ~PAGE_MASK));
/* Calculate left bytes in current memory segment. */
nr_bytes = (curr_m->size - (start - curr_m->paddr));
_
next prev parent reply other threads:[~2013-02-08 0:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-03 13:13 [PATCH] fs/proc/vmcore.c: Put if tests in the top of the while loop to reduce duplication Zhang Yanfei
2013-02-08 0:06 ` Andrew Morton [this message]
2013-02-08 14:25 ` Eric W. Biederman
2013-02-08 17:52 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130207160620.6c8f93d4.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mahesh@linux.vnet.ibm.com \
--cc=zhangyanfei.yes@gmail.com \
--cc=zhangyanfei@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).