fs-proc-vmcorec-put-if-tests-in-the-top-of-the-while-loop-to-reduce-duplication-fix

avoid `if (foo = bar)' thing, use min_t()

Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index b92b289010ba46cc051d313a5f3778cfd9882b3f..6e2bcf4c051ff7f3a5e8956b73571cb27c02026b 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -178,8 +178,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
                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));