diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 14:51:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:13:03 -0700 |
| commit | a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c (patch) | |
| tree | 4a747a92c9bd7a8703004603ee9e91f8bfb7e95a /arch/um/drivers/net_user.c | |
| parent | a263672424e591067e42e1d8371e56927fe73af8 (diff) | |
| download | linux-3.10-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.tar.gz linux-3.10-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.tar.bz2 linux-3.10-a6ea4cceed18edebe1eb6001cb9e0f88cd741a6c.zip | |
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/net_user.c')
| -rw-r--r-- | arch/um/drivers/net_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index 8bc6688c4f0..3503cff867c 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; |