diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 17:51:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:03 -0400 |
commit | fda83a99b2b49016b9d7ed562745969db25c4ef9 (patch) | |
tree | 45b6282e98841b8d608523a1df57d4a4c51c6965 /arch/um/drivers/net_user.c | |
parent | 77f6af778dc23514d897f4fdc7935329285ecb1b (diff) |
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>
Diffstat (limited to 'arch/um/drivers/net_user.c')
-rw-r--r-- | arch/um/drivers/net_user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index 2dc57a37e4b7..8bc6688c4f0f 100644 --- 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) | |||
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(fd, output, expected); | 76 | ret = os_read_file_k(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(fd, buf, len); | 97 | n = os_read_file_k(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(fd, buf, len); | 125 | n = os_write_file_k(fd, buf, len); |
126 | 126 | ||
127 | if(n == -EAGAIN) | 127 | if(n == -EAGAIN) |
128 | return 0; | 128 | return 0; |