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, 2 insertions, 2 deletions

diff --git a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
index e1fd26c1b728..b869e3899683 100644
--- a/arch/um/drivers/daemon_user.c
+++ b/arch/um/drivers/daemon_user.c
@@ -94,7 +94,7 @@ static int connect_to_switch(struct daemon_data *pri)
         req.version = SWITCH_VERSION;
         req.type = REQ_NEW_CONTROL;
         req.sock = *local_addr;
-        n = os_write_file_k(pri->control, &req, sizeof(req));
+        n = os_write_file(pri->control, &req, sizeof(req));
         if(n != sizeof(req)){
                 printk("daemon_open : control setup request failed, err = %d\n",
                        -n);
@@ -102,7 +102,7 @@ static int connect_to_switch(struct daemon_data *pri)
                 goto out_free;
         }
 
-        n = os_read_file_k(pri->control, sun, sizeof(*sun));
+        n = os_read_file(pri->control, sun, sizeof(*sun));
         if(n != sizeof(*sun)){
                 printk("daemon_open : read of data socket failed, err = %d\n",
                        -n);