aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-05-06 17:51:43 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:13:03 -0400
commita6ea4cceed18edebe1eb6001cb9e0f88cd741a6c (patch)
tree4a747a92c9bd7a8703004603ee9e91f8bfb7e95a /arch/um/drivers
parenta263672424e591067e42e1d8371e56927fe73af8 (diff)
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>
Diffstat (limited to 'arch/um/drivers')
-rw-r--r--arch/um/drivers/chan_kern.c4
-rw-r--r--arch/um/drivers/chan_user.c10
-rw-r--r--arch/um/drivers/cow_sys.h2
-rw-r--r--arch/um/drivers/daemon_user.c4
-rw-r--r--arch/um/drivers/harddog_user.c4
-rw-r--r--arch/um/drivers/hostaudio_kern.c4
-rw-r--r--arch/um/drivers/net_user.c8
-rw-r--r--arch/um/drivers/port_kern.c2
-rw-r--r--arch/um/drivers/random.c2
-rw-r--r--arch/um/drivers/ubd_kern.c20
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)
98{ 98{
99 int n; 99 int n;
100 100
101 n = os_read_file_k(fd, c_out, sizeof(*c_out)); 101 n = os_read_file(fd, c_out, sizeof(*c_out));
102 102
103 if(n == -EAGAIN) 103 if(n == -EAGAIN)
104 return 0; 104 return 0;
@@ -111,7 +111,7 @@ int generic_read(int fd, char *c_out, void *unused)
111 111
112int generic_write(int fd, const char *buf, int n, void *unused) 112int generic_write(int fd, const char *buf, int n, void *unused)
113{ 113{
114 return os_write_file_k(fd, buf, n); 114 return os_write_file(fd, buf, n);
115} 115}
116 116
117int generic_window_size(int fd, void *unused, unsigned short *rows_out, 117int 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)
85 85
86 pty_fd = data->pty_fd; 86 pty_fd = data->pty_fd;
87 pipe_fd = data->pipe_fd; 87 pipe_fd = data->pipe_fd;
88 count = os_write_file_k(pipe_fd, &c, sizeof(c)); 88 count = os_write_file(pipe_fd, &c, sizeof(c));
89 if(count != sizeof(c)) 89 if(count != sizeof(c))
90 printk("winch_thread : failed to write synchronization " 90 printk("winch_thread : failed to write synchronization "
91 "byte, err = %d\n", -count); 91 "byte, err = %d\n", -count);
@@ -120,7 +120,7 @@ static int winch_thread(void *arg)
120 * host - since they are not different kernel threads, we cannot use 120 * host - since they are not different kernel threads, we cannot use
121 * kernel semaphores. We don't use SysV semaphores because they are 121 * kernel semaphores. We don't use SysV semaphores because they are
122 * persistent. */ 122 * persistent. */
123 count = os_read_file_k(pipe_fd, &c, sizeof(c)); 123 count = os_read_file(pipe_fd, &c, sizeof(c));
124 if(count != sizeof(c)) 124 if(count != sizeof(c))
125 printk("winch_thread : failed to read synchronization byte, " 125 printk("winch_thread : failed to read synchronization byte, "
126 "err = %d\n", -count); 126 "err = %d\n", -count);
@@ -130,7 +130,7 @@ static int winch_thread(void *arg)
130 * are blocked.*/ 130 * are blocked.*/
131 sigsuspend(&sigs); 131 sigsuspend(&sigs);
132 132
133 count = os_write_file_k(pipe_fd, &c, sizeof(c)); 133 count = os_write_file(pipe_fd, &c, sizeof(c));
134 if(count != sizeof(c)) 134 if(count != sizeof(c))
135 printk("winch_thread : write failed, err = %d\n", 135 printk("winch_thread : write failed, err = %d\n",
136 -count); 136 -count);
@@ -162,7 +162,7 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
162 } 162 }
163 163
164 *fd_out = fds[0]; 164 *fd_out = fds[0];
165 n = os_read_file_k(fds[0], &c, sizeof(c)); 165 n = os_read_file(fds[0], &c, sizeof(c));
166 if(n != sizeof(c)){ 166 if(n != sizeof(c)){
167 printk("winch_tramp : failed to read synchronization byte\n"); 167 printk("winch_tramp : failed to read synchronization byte\n");
168 printk("read failed, err = %d\n", -n); 168 printk("read failed, err = %d\n", -n);
@@ -195,7 +195,7 @@ void register_winch(int fd, struct tty_struct *tty)
195 if(thread > 0){ 195 if(thread > 0){
196 register_winch_irq(thread_fd, fd, thread, tty); 196 register_winch_irq(thread_fd, fd, thread, tty);
197 197
198 count = os_write_file_k(thread_fd, &c, sizeof(c)); 198 count = os_write_file(thread_fd, &c, sizeof(c));
199 if(count != sizeof(c)) 199 if(count != sizeof(c))
200 printk("register_winch : failed to write " 200 printk("register_winch : failed to write "
201 "synchronization byte, err = %d\n", 201 "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)
35 35
36static inline int cow_write_file(int fd, void *buf, int size) 36static inline int cow_write_file(int fd, void *buf, int size)
37{ 37{
38 return os_write_file_k(fd, buf, size); 38 return os_write_file(fd, buf, size);
39} 39}
40 40
41#endif 41#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)
94 req.version = SWITCH_VERSION; 94 req.version = SWITCH_VERSION;
95 req.type = REQ_NEW_CONTROL; 95 req.type = REQ_NEW_CONTROL;
96 req.sock = *local_addr; 96 req.sock = *local_addr;
97 n = os_write_file_k(pri->control, &req, sizeof(req)); 97 n = os_write_file(pri->control, &req, sizeof(req));
98 if(n != sizeof(req)){ 98 if(n != sizeof(req)){
99 printk("daemon_open : control setup request failed, err = %d\n", 99 printk("daemon_open : control setup request failed, err = %d\n",
100 -n); 100 -n);
@@ -102,7 +102,7 @@ static int connect_to_switch(struct daemon_data *pri)
102 goto out_free; 102 goto out_free;
103 } 103 }
104 104
105 n = os_read_file_k(pri->control, sun, sizeof(*sun)); 105 n = os_read_file(pri->control, sun, sizeof(*sun));
106 if(n != sizeof(*sun)){ 106 if(n != sizeof(*sun)){
107 printk("daemon_open : read of data socket failed, err = %d\n", 107 printk("daemon_open : read of data socket failed, err = %d\n",
108 -n); 108 -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)
79 goto out_close_out; 79 goto out_close_out;
80 } 80 }
81 81
82 n = os_read_file_k(in_fds[0], &c, sizeof(c)); 82 n = os_read_file(in_fds[0], &c, sizeof(c));
83 if(n == 0){ 83 if(n == 0){
84 printk("harddog_open - EOF on watchdog pipe\n"); 84 printk("harddog_open - EOF on watchdog pipe\n");
85 helper_wait(pid); 85 helper_wait(pid);
@@ -118,7 +118,7 @@ int ping_watchdog(int fd)
118 int n; 118 int n;
119 char c = '\n'; 119 char c = '\n';
120 120
121 n = os_write_file_k(fd, &c, sizeof(c)); 121 n = os_write_file(fd, &c, sizeof(c));
122 if(n != sizeof(c)){ 122 if(n != sizeof(c)){
123 printk("ping_watchdog - write failed, err = %d\n", -n); 123 printk("ping_watchdog - write failed, err = %d\n", -n);
124 if(n < 0) 124 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,
84 if(kbuf == NULL) 84 if(kbuf == NULL)
85 return(-ENOMEM); 85 return(-ENOMEM);
86 86
87 err = os_read_file_k(state->fd, kbuf, count); 87 err = os_read_file(state->fd, kbuf, count);
88 if(err < 0) 88 if(err < 0)
89 goto out; 89 goto out;
90 90
@@ -115,7 +115,7 @@ static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
115 if(copy_from_user(kbuf, buffer, count)) 115 if(copy_from_user(kbuf, buffer, count))
116 goto out; 116 goto out;
117 117
118 err = os_write_file_k(state->fd, kbuf, count); 118 err = os_write_file(state->fd, kbuf, count);
119 if(err < 0) 119 if(err < 0)
120 goto out; 120 goto out;
121 *ppos += err; 121 *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)
63 } 63 }
64 64
65 *output = '\0'; 65 *output = '\0';
66 ret = os_read_file_k(fd, &remain, sizeof(remain)); 66 ret = os_read_file(fd, &remain, sizeof(remain));
67 67
68 if (ret != sizeof(remain)) { 68 if (ret != sizeof(remain)) {
69 expected = sizeof(remain); 69 expected = sizeof(remain);
@@ -73,7 +73,7 @@ void read_output(int fd, char *output, int len)
73 73
74 while(remain != 0){ 74 while(remain != 0){
75 expected = (remain < len) ? remain : len; 75 expected = (remain < len) ? remain : len;
76 ret = os_read_file_k(fd, output, expected); 76 ret = os_read_file(fd, output, expected);
77 if (ret != expected) { 77 if (ret != expected) {
78 str = "data"; 78 str = "data";
79 goto err; 79 goto err;
@@ -94,7 +94,7 @@ int net_read(int fd, void *buf, int len)
94{ 94{
95 int n; 95 int n;
96 96
97 n = os_read_file_k(fd, buf, len); 97 n = os_read_file(fd, buf, len);
98 98
99 if(n == -EAGAIN) 99 if(n == -EAGAIN)
100 return 0; 100 return 0;
@@ -122,7 +122,7 @@ int net_write(int fd, void *buf, int len)
122{ 122{
123 int n; 123 int n;
124 124
125 n = os_write_file_k(fd, buf, len); 125 n = os_write_file(fd, buf, len);
126 126
127 if(n == -EAGAIN) 127 if(n == -EAGAIN)
128 return 0; 128 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)
113 } 113 }
114 114
115 if(atomic_read(&port->wait_count) == 0){ 115 if(atomic_read(&port->wait_count) == 0){
116 os_write_file_k(fd, NO_WAITER_MSG, sizeof(NO_WAITER_MSG)); 116 os_write_file(fd, NO_WAITER_MSG, sizeof(NO_WAITER_MSG));
117 printk("No one waiting for port\n"); 117 printk("No one waiting for port\n");
118 } 118 }
119 list_add(&conn->list, &port->pending); 119 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,
44 int n, ret = 0, have_data; 44 int n, ret = 0, have_data;
45 45
46 while(size){ 46 while(size){
47 n = os_read_file_k(random_fd, &data, sizeof(data)); 47 n = os_read_file(random_fd, &data, sizeof(data));
48 if(n > 0){ 48 if(n > 0){
49 have_data = n; 49 have_data = n;
50 while (have_data && size) { 50 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)
511 int n; 511 int n;
512 512
513 while(1){ 513 while(1){
514 n = os_read_file_k(thread_fd, &req, 514 n = os_read_file(thread_fd, &req,
515 sizeof(struct io_thread_req *)); 515 sizeof(struct io_thread_req *));
516 if(n != sizeof(req)){ 516 if(n != sizeof(req)){
517 if(n == -EAGAIN) 517 if(n == -EAGAIN)
518 break; 518 break;
@@ -1112,8 +1112,8 @@ static void do_ubd_request(request_queue_t *q)
1112 (unsigned long long) req->sector << 9, 1112 (unsigned long long) req->sector << 9,
1113 sg->offset, sg->length, sg->page); 1113 sg->offset, sg->length, sg->page);
1114 1114
1115 n = os_write_file_k(thread_fd, &io_req, 1115 n = os_write_file(thread_fd, &io_req,
1116 sizeof(struct io_thread_req *)); 1116 sizeof(struct io_thread_req *));
1117 if(n != sizeof(struct io_thread_req *)){ 1117 if(n != sizeof(struct io_thread_req *)){
1118 if(n != -EAGAIN) 1118 if(n != -EAGAIN)
1119 printk("write to io thread failed, " 1119 printk("write to io thread failed, "
@@ -1366,8 +1366,8 @@ static int update_bitmap(struct io_thread_req *req)
1366 return 1; 1366 return 1;
1367 } 1367 }
1368 1368
1369 n = os_write_file_k(req->fds[1], &req->bitmap_words, 1369 n = os_write_file(req->fds[1], &req->bitmap_words,
1370 sizeof(req->bitmap_words)); 1370 sizeof(req->bitmap_words));
1371 if(n != sizeof(req->bitmap_words)){ 1371 if(n != sizeof(req->bitmap_words)){
1372 printk("do_io - bitmap update failed, err = %d fd = %d\n", -n, 1372 printk("do_io - bitmap update failed, err = %d fd = %d\n", -n,
1373 req->fds[1]); 1373 req->fds[1]);
@@ -1411,7 +1411,7 @@ void do_io(struct io_thread_req *req)
1411 do { 1411 do {
1412 buf = &buf[n]; 1412 buf = &buf[n];
1413 len -= n; 1413 len -= n;
1414 n = os_read_file_k(req->fds[bit], buf, len); 1414 n = os_read_file(req->fds[bit], buf, len);
1415 if (n < 0) { 1415 if (n < 0) {
1416 printk("do_io - read failed, err = %d " 1416 printk("do_io - read failed, err = %d "
1417 "fd = %d\n", -n, req->fds[bit]); 1417 "fd = %d\n", -n, req->fds[bit]);
@@ -1421,7 +1421,7 @@ void do_io(struct io_thread_req *req)
1421 } while((n < len) && (n != 0)); 1421 } while((n < len) && (n != 0));
1422 if (n < len) memset(&buf[n], 0, len - n); 1422 if (n < len) memset(&buf[n], 0, len - n);
1423 } else { 1423 } else {
1424 n = os_write_file_k(req->fds[bit], buf, len); 1424 n = os_write_file(req->fds[bit], buf, len);
1425 if(n != len){ 1425 if(n != len){
1426 printk("do_io - write failed err = %d " 1426 printk("do_io - write failed err = %d "
1427 "fd = %d\n", -n, req->fds[bit]); 1427 "fd = %d\n", -n, req->fds[bit]);
@@ -1451,7 +1451,7 @@ int io_thread(void *arg)
1451 1451
1452 ignore_sigwinch_sig(); 1452 ignore_sigwinch_sig();
1453 while(1){ 1453 while(1){
1454 n = os_read_file_k(kernel_fd, &req, 1454 n = os_read_file(kernel_fd, &req,
1455 sizeof(struct io_thread_req *)); 1455 sizeof(struct io_thread_req *));
1456 if(n != sizeof(struct io_thread_req *)){ 1456 if(n != sizeof(struct io_thread_req *)){
1457 if(n < 0) 1457 if(n < 0)
@@ -1465,7 +1465,7 @@ int io_thread(void *arg)
1465 } 1465 }
1466 io_count++; 1466 io_count++;
1467 do_io(req); 1467 do_io(req);
1468 n = os_write_file_k(kernel_fd, &req, 1468 n = os_write_file(kernel_fd, &req,
1469 sizeof(struct io_thread_req *)); 1469 sizeof(struct io_thread_req *));
1470 if(n != sizeof(struct io_thread_req *)) 1470 if(n != sizeof(struct io_thread_req *))
1471 printk("io_thread - write failed, fd = %d, err = %d\n", 1471 printk("io_thread - write failed, fd = %d, err = %d\n",