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>

10 files changed, 30 insertions, 30 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 92e069e8253f..3aa351611763 100644
--- 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_k(fd, c_out, sizeof(*c_out));
+        n = os_read_file(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_k(fd, buf, n);
+        return os_write_file(fd, buf, n);
 }
 
 int generic_window_size(int fd, void *unused, unsigned short *rows_out,
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index a15be1720e03..13f0bf852b2a 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -85,7 +85,7 @@ static int winch_thread(void *arg)
 
         pty_fd = data->pty_fd;
         pipe_fd = data->pipe_fd;
-        count = os_write_file_k(pipe_fd, &c, sizeof(c));
+        count = os_write_file(pipe_fd, &c, sizeof(c));
         if(count != sizeof(c))
                 printk("winch_thread : failed to write synchronization "
                        "byte, err = %d\n", -count);
@@ -120,7 +120,7 @@ static int winch_thread(void *arg)
          * host - since they are not different kernel threads, we cannot use
          * kernel semaphores. We don't use SysV semaphores because they are
          * persistent. */
-        count = os_read_file_k(pipe_fd, &c, sizeof(c));
+        count = os_read_file(pipe_fd, &c, sizeof(c));
         if(count != sizeof(c))
                 printk("winch_thread : failed to read synchronization byte, "
                        "err = %d\n", -count);
@@ -130,7 +130,7 @@ static int winch_thread(void *arg)
                  * are blocked.*/
                 sigsuspend(&sigs);
 
-                count = os_write_file_k(pipe_fd, &c, sizeof(c));
+                count = os_write_file(pipe_fd, &c, sizeof(c));
                 if(count != sizeof(c))
                         printk("winch_thread : write failed, err = %d\n",
                                -count);
@@ -162,7 +162,7 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
         }
 
         *fd_out = fds[0];
-        n = os_read_file_k(fds[0], &c, sizeof(c));
+        n = os_read_file(fds[0], &c, sizeof(c));
         if(n != sizeof(c)){
                 printk("winch_tramp : failed to read synchronization byte\n");
                 printk("read failed, err = %d\n", -n);
@@ -195,7 +195,7 @@ void register_winch(int fd, struct tty_struct *tty)
                 if(thread > 0){
                         register_winch_irq(thread_fd, fd, thread, tty);
 
-                        count = os_write_file_k(thread_fd, &c, sizeof(c));
+                        count = os_write_file(thread_fd, &c, sizeof(c));
                         if(count != sizeof(c))
                                 printk("register_winch : failed to write "
                                        "synchronization byte, err = %d\n",
diff --git a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
index aa7bef9c38d9..15453845d2ba 100644
--- 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_k(fd, buf, size);
+        return os_write_file(fd, buf, size);
 }
 
 #endif
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);
diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index 0fbb1615171e..5eeecf8917c3 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -79,7 +79,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
                 goto out_close_out;
         }
 
-        n = os_read_file_k(in_fds[0], &c, sizeof(c));
+        n = os_read_file(in_fds[0], &c, sizeof(c));
         if(n == 0){
                 printk("harddog_open - EOF on watchdog pipe\n");
                 helper_wait(pid);
@@ -118,7 +118,7 @@ int ping_watchdog(int fd)
         int n;
         char c = '\n';
 
-        n = os_write_file_k(fd, &c, sizeof(c));
+        n = os_write_file(fd, &c, sizeof(c));
         if(n != sizeof(c)){
                 printk("ping_watchdog - write failed, err = %d\n", -n);
                 if(n < 0)
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index bd6688ea96de..10e08a8c17c3 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -84,7 +84,7 @@ static ssize_t hostaudio_read(struct file *file, char __user *buffer,
         if(kbuf == NULL)
                 return(-ENOMEM);
 
-        err = os_read_file_k(state->fd, kbuf, count);
+        err = os_read_file(state->fd, kbuf, count);
         if(err < 0)
                 goto out;
 
@@ -115,7 +115,7 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
         if(copy_from_user(kbuf, buffer, count))
                 goto out;
 
-        err = os_write_file_k(state->fd, kbuf, count);
+        err = os_write_file(state->fd, kbuf, count);
         if(err < 0)
                 goto out;
         *ppos += err;
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;
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index 75bb40126c2e..1c8efd95c421 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -113,7 +113,7 @@ static int port_accept(struct port_list *port)
         }
 
         if(atomic_read(&port->wait_count) == 0){
-                os_write_file_k(fd, NO_WAITER_MSG, sizeof(NO_WAITER_MSG));
+                os_write_file(fd, NO_WAITER_MSG, sizeof(NO_WAITER_MSG));
                 printk("No one waiting for port\n");
         }
         list_add(&conn->list, &port->pending);
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index 94838f4c1645..e942e836f995 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -44,7 +44,7 @@ static ssize_t rng_dev_read (struct file *filp, char __user *buf, size_t size,
         int n, ret = 0, have_data;
 
         while(size){
-                n = os_read_file_k(random_fd, &data, sizeof(data));
+                n = os_read_file(random_fd, &data, sizeof(data));
                 if(n > 0){
                         have_data = n;
                         while (have_data && size) {
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 614fe25a31bd..70509ddaac03 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -511,8 +511,8 @@ static void ubd_handler(void)
         int n;
 
         while(1){
-                n = os_read_file_k(thread_fd, &req,
-                                   sizeof(struct io_thread_req *));
+                n = os_read_file(thread_fd, &req,
+                                 sizeof(struct io_thread_req *));
                 if(n != sizeof(req)){
                         if(n == -EAGAIN)
                                 break;
@@ -1112,8 +1112,8 @@ static void do_ubd_request(request_queue_t *q)
                                         (unsigned long long) req->sector << 9,
                                         sg->offset, sg->length, sg->page);
 
-                        n = os_write_file_k(thread_fd, &io_req,
-                                            sizeof(struct io_thread_req *));
+                        n = os_write_file(thread_fd, &io_req,
+                                          sizeof(struct io_thread_req *));
                         if(n != sizeof(struct io_thread_req *)){
                                 if(n != -EAGAIN)
                                         printk("write to io thread failed, "
@@ -1366,8 +1366,8 @@ static int update_bitmap(struct io_thread_req *req)
                 return 1;
         }
 
-        n = os_write_file_k(req->fds[1], &req->bitmap_words,
-                            sizeof(req->bitmap_words));
+        n = os_write_file(req->fds[1], &req->bitmap_words,
+                          sizeof(req->bitmap_words));
         if(n != sizeof(req->bitmap_words)){
                 printk("do_io - bitmap update failed, err = %d fd = %d\n", -n,
                        req->fds[1]);
@@ -1411,7 +1411,7 @@ void do_io(struct io_thread_req *req)
                         do {
                                 buf = &buf[n];
                                 len -= n;
-                                n = os_read_file_k(req->fds[bit], buf, len);
+                                n = os_read_file(req->fds[bit], buf, len);
                                 if (n < 0) {
                                         printk("do_io - read failed, err = %d "
                                                "fd = %d\n", -n, req->fds[bit]);
@@ -1421,7 +1421,7 @@ void do_io(struct io_thread_req *req)
                         } while((n < len) && (n != 0));
                         if (n < len) memset(&buf[n], 0, len - n);
                 } else {
-                        n = os_write_file_k(req->fds[bit], buf, len);
+                        n = os_write_file(req->fds[bit], buf, len);
                         if(n != len){
                                 printk("do_io - write failed err = %d "
                                        "fd = %d\n", -n, req->fds[bit]);
@@ -1451,7 +1451,7 @@ int io_thread(void *arg)
 
         ignore_sigwinch_sig();
         while(1){
-                n = os_read_file_k(kernel_fd, &req,
+                n = os_read_file(kernel_fd, &req,
                                  sizeof(struct io_thread_req *));
                 if(n != sizeof(struct io_thread_req *)){
                         if(n < 0)
@@ -1465,7 +1465,7 @@ int io_thread(void *arg)
                 }
                 io_count++;
                 do_io(req);
-                n = os_write_file_k(kernel_fd, &req,
+                n = os_write_file(kernel_fd, &req,
                                   sizeof(struct io_thread_req *));
                 if(n != sizeof(struct io_thread_req *))
                         printk("io_thread - write failed, fd = %d, err = %d\n",