uml: change remaining callers of os_{read_write}_file

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>

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 3aa3516..92e069e 100644 (file)
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -98,7 +98,7 @@ int generic_read(int fd, char *c_out, void *unused)
 {
        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)
                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)
 {
-       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,

diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index c702943..3255583 100644 (file)
--- a/arch/um/drivers/cow_sys.h
+++ b/arch/um/drivers/cow_sys.h
@@ -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)
 {
-       return(os_write_file(fd, buf, size));
+       return(os_write_file_k(fd, buf, size));
 }
 
 #endif

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 2dc57a3..8bc6688 100644 (file)
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -73,7 +73,7 @@ void read_output(int fd, char *output, int len)
 
        while(remain != 0){
                expected = (remain < len) ? remain : len;
-               ret = os_read_file(fd, output, expected);
+               ret = os_read_file_k(fd, output, expected);
                if (ret != expected) {
                        str = "data";
                        goto err;
@@ -94,7 +94,7 @@ int net_read(int fd, void *buf, int len)
 {
        int n;
 
-       n = os_read_file(fd,  buf,  len);
+       n = os_read_file_k(fd,  buf,  len);
 
        if(n == -EAGAIN)
                return 0;
@@ -122,7 +122,7 @@ int net_write(int fd, void *buf, int len)
 {
        int n;
 
-       n = os_write_file(fd, buf, len);
+       n = os_write_file_k(fd, buf, len);
 
        if(n == -EAGAIN)
                return 0;

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 88a246e..2a00203 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -1246,7 +1246,7 @@ int read_cow_bitmap(int fd, void *buf, int offset, int len)
        if(err < 0)
                return(err);
 
-       err = os_read_file(fd, buf, len);
+       err = os_read_file_k(fd, buf, len);
        if(err < 0)
                return(err);
 

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 6ab1539..bf3dd96 100644 (file)
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -55,7 +55,7 @@ int load_initrd(char *filename, void *buf, int size)
                printk("Opening '%s' failed - err = %d\n", filename, -fd);
                return(-1);
        }
-       n = os_read_file(fd, buf, size);
+       n = os_read_file_k(fd, buf, size);
        if(n != size){
                printk("Read of %d bytes from '%s' failed, err = %d\n", size,
                       filename, -n);

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index a985620..77021a6 100644 (file)
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -211,7 +211,7 @@ void physmem_forget_descriptor(int fd)
                        panic("physmem_forget_descriptor - failed to seek "
                              "to %lld in fd %d, error = %d\n",
                              offset, fd, -err);
-               err = os_read_file(fd, addr, PAGE_SIZE);
+               err = os_read_file_k(fd, addr, PAGE_SIZE);
                if(err < 0)
                        panic("physmem_forget_descriptor - failed to read "
                              "from fd %d to 0x%p, error = %d\n",

diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index 74fd062..f5dfe49 100644 (file)
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -28,7 +28,7 @@ static char token(int fd, char *buf, int len, char stop)
        ptr = buf;
        end = &buf[len];
        do {
-               n = os_read_file(fd, ptr, sizeof(*ptr));
+               n = os_read_file_k(fd, ptr, sizeof(*ptr));
                c = *ptr++;
                if(n != sizeof(*ptr)){
                        if(n == 0)