lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uml: rename os_{read_write}_file_k back to os_{read_write}_file

Browse Source 
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>
This commit is contained in:
Jeff Dike
2007-05-06 14:51:43 -07:00
committed by Linus Torvalds
parent a263672424
commit a6ea4cceed
22 changed files with 51 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/um/drivers/net_user.c
View File

@@ -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;