luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uml: change remaining callers of os_{read_write}_file

Browse Source 
Convert all remaining os_{read_write}_file users to use the simple
{read,write} wrappers, os_{read_write}_file_k.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2007-05-06 14:51:41 -07:00 committed by Linus Torvalds
parent 77f6af778d
commit fda83a99b2
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/drivers/chan_kern.c
View File

@ -98,7 +98,7 @@ int generic_read(int fd, char *c_out, void *unused)
{ {
int n; int n;
n = os_read_file(fd, c_out, sizeof(*c_out)); n = os_read_file_k(fd, c_out, sizeof(*c_out));
if(n == -EAGAIN) if(n == -EAGAIN)
return 0; return 0;
@ -111,7 +111,7 @@ int generic_read(int fd, char *c_out, void *unused)
int generic_write(int fd, const char *buf, int n, void *unused) int generic_write(int fd, const char *buf, int n, void *unused)
{ {
return os_write_file(fd, buf, n); return os_write_file_k(fd, buf, n);
} }
int generic_window_size(int fd, void *unused, unsigned short *rows_out, int generic_window_size(int fd, void *unused, unsigned short *rows_out,

2
arch/um/drivers/cow_sys.h
View File

@ -35,7 +35,7 @@ static inline int cow_file_size(char *file, unsigned long long *size_out)
static inline int cow_write_file(int fd, void *buf, int size) static inline int cow_write_file(int fd, void *buf, int size)
{ {
return(os_write_file(fd, buf, size)); return(os_write_file_k(fd, buf, size));
} }
#endif #endif

6
arch/um/drivers/net_user.c
View File

@ -73,7 +73,7 @@ void read_output(int fd, char *output, int len)
while(remain != 0){ while(remain != 0){
expected = (remain < len) ? remain : len; expected = (remain < len) ? remain : len;
ret = os_read_file(fd, output, expected); ret = os_read_file_k(fd, output, expected);
if (ret != expected) { if (ret != expected) {
str = "data"; str = "data";
goto err; goto err;
@ -94,7 +94,7 @@ int net_read(int fd, void *buf, int len)
{ {
int n; int n;
n = os_read_file(fd, buf, len); n = os_read_file_k(fd, buf, len);
if(n == -EAGAIN) if(n == -EAGAIN)
return 0; return 0;
@ -122,7 +122,7 @@ int net_write(int fd, void *buf, int len)
{ {
int n; int n;
n = os_write_file(fd, buf, len); n = os_write_file_k(fd, buf, len);
if(n == -EAGAIN) if(n == -EAGAIN)
return 0; return 0;

2
arch/um/drivers/ubd_kern.c
View File

@ -1246,7 +1246,7 @@ int read_cow_bitmap(int fd, void *buf, int offset, int len)
if(err < 0) if(err < 0)
return(err); return(err);
err = os_read_file(fd, buf, len); err = os_read_file_k(fd, buf, len);
if(err < 0) if(err < 0)
return(err); return(err);

2
arch/um/kernel/initrd.c
View File

@ -55,7 +55,7 @@ int load_initrd(char *filename, void *buf, int size)
printk("Opening '%s' failed - err = %d\n", filename, -fd); printk("Opening '%s' failed - err = %d\n", filename, -fd);
return(-1); return(-1);
} }
n = os_read_file(fd, buf, size); n = os_read_file_k(fd, buf, size);
if(n != size){ if(n != size){
printk("Read of %d bytes from '%s' failed, err = %d\n", size, printk("Read of %d bytes from '%s' failed, err = %d\n", size,
filename, -n); filename, -n);

2
arch/um/kernel/physmem.c
View File

@ -211,7 +211,7 @@ void physmem_forget_descriptor(int fd)
panic("physmem_forget_descriptor - failed to seek " panic("physmem_forget_descriptor - failed to seek "
"to %lld in fd %d, error = %d\n", "to %lld in fd %d, error = %d\n",
offset, fd, -err); offset, fd, -err);
err = os_read_file(fd, addr, PAGE_SIZE); err = os_read_file_k(fd, addr, PAGE_SIZE);
if(err < 0) if(err < 0)
panic("physmem_forget_descriptor - failed to read " panic("physmem_forget_descriptor - failed to read "
"from fd %d to 0x%p, error = %d\n", "from fd %d to 0x%p, error = %d\n",

2
arch/um/sys-i386/bugs.c
View File

@ -28,7 +28,7 @@ static char token(int fd, char *buf, int len, char stop)
ptr = buf; ptr = buf;
end = &buf[len]; end = &buf[len];
do { do {
n = os_read_file(fd, ptr, sizeof(*ptr)); n = os_read_file_k(fd, ptr, sizeof(*ptr));
c = *ptr++; c = *ptr++;
if(n != sizeof(*ptr)){ if(n != sizeof(*ptr)){
if(n == 0) if(n == 0)