uml: rename os_{read_write}_file_k back to os_{read_write}_file

Rename os_{read_write}_file_k back to os_{read_write}_file, delete
the originals and their bogus infrastructure, and fix all the callers.

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>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 8bc6688c4f0f..3503cff867c3 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -63,7 +63,7 @@ void read_output(int fd, char *output, int len)
         }
                 
         *output = '\0';
-        ret = os_read_file_k(fd, &remain, sizeof(remain));
+        ret = os_read_file(fd, &remain, sizeof(remain));
 
         if (ret != sizeof(remain)) {
                 expected = sizeof(remain);
@@ -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_k(fd, output, expected);
+                ret = os_read_file(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_k(fd,  buf,  len);
+        n = os_read_file(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_k(fd, buf, len);
+        n = os_write_file(fd, buf, len);
 
         if(n == -EAGAIN)
                 return 0;