adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

/dev/mem: remove the "written" variable in write_kmem()

Browse source 
Also rename "len" to "sz". No behavior change.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Avi Kivity <avi@qumranet.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Wu Fengguang 2009-12-14 17:58:10 -08:00 committed by Linus Torvalds
parent 7fabaddd09
commit 80ad89a0ce
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/char/mem.c
View file

@ -440,19 +440,18 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
if (!kbuf) if (!kbuf)
return -ENOMEM; return -ENOMEM;
while (count > 0) { while (count > 0) {
int len = size_inside_page(p, count); sz = size_inside_page(p, count);
sz = vread(kbuf, (char *)p, sz);
len = vread(kbuf, (char *)p, len); if (!sz)
if (!len)
break; break;
if (copy_to_user(buf, kbuf, len)) { if (copy_to_user(buf, kbuf, sz)) {
free_page((unsigned long)kbuf); free_page((unsigned long)kbuf);
return -EFAULT; return -EFAULT;
} }
count -= len; count -= sz;
buf += len; buf += sz;
read += len; read += sz;
p += len; p += sz;
} }
free_page((unsigned long)kbuf); free_page((unsigned long)kbuf);
} }
@ -522,19 +521,14 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
unsigned long p = *ppos; unsigned long p = *ppos;
ssize_t wrote = 0; ssize_t wrote = 0;
ssize_t virtr = 0; ssize_t virtr = 0;
ssize_t written;
char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
if (p < (unsigned long) high_memory) { if (p < (unsigned long) high_memory) {
unsigned long to_write = min_t(unsigned long, count,
wrote = count; (unsigned long)high_memory - p);
if (count > (unsigned long) high_memory - p) wrote = do_write_kmem((void *)p, p, buf, to_write, ppos);
wrote = (unsigned long) high_memory - p; if (wrote != to_write)
return wrote;
written = do_write_kmem((void*)p, p, buf, wrote, ppos);
if (written != wrote)
return written;
wrote = written;
p += wrote; p += wrote;
buf += wrote; buf += wrote;
count -= wrote; count -= wrote;
@ -545,20 +539,21 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
if (!kbuf) if (!kbuf)
return wrote ? wrote : -ENOMEM; return wrote ? wrote : -ENOMEM;
while (count > 0) { while (count > 0) {
int len = size_inside_page(p, count); unsigned long sz = size_inside_page(p, count);
unsigned long n;
written = copy_from_user(kbuf, buf, len); n = copy_from_user(kbuf, buf, sz);
if (written) { if (n) {
if (wrote + virtr) if (wrote + virtr)
break; break;
free_page((unsigned long)kbuf); free_page((unsigned long)kbuf);
return -EFAULT; return -EFAULT;
} }
len = vwrite(kbuf, (char *)p, len); sz = vwrite(kbuf, (char *)p, sz);
count -= len; count -= sz;
buf += len; buf += sz;
virtr += len; virtr += sz;
p += len; p += sz;
} }
free_page((unsigned long)kbuf); free_page((unsigned long)kbuf);
} }