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

uml: convert libc layer to call read and write

Browse Source 
This patch converts calls in the os layer to os_{read,write}_file to calls
directly to libc read() and write() where it is clear that the I/O buffer is
in the kernel.

We can do that here instead of calling os_{read,write}_file_k since we are in
libc code and can call libc directly.

With the change in the calls, error handling needs to be changed to refer to
errno directly rather than the return value of the call.

CATCH_EINTR wrappers were also added where needed.

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:35 -07:00
committed by Linus Torvalds
parent ef0470c053
commit a61f334fd2
9 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/um/os-Linux/tty_log.c
View File

@ -53,8 +53,8 @@ int open_tty_log(void *tty, void *current_tty)
.direction = 0,
.sec = tv.tv_sec,
.usec = tv.tv_usec } );
os_write_file(tty_log_fd, &data, sizeof(data));
os_write_file(tty_log_fd, &current_tty, data.len);
write(tty_log_fd, &data, sizeof(data));
write(tty_log_fd, &current_tty, data.len);
return tty_log_fd;
}
@ -83,7 +83,7 @@ void close_tty_log(int fd, void *tty)
.direction = 0,
.sec = tv.tv_sec,
.usec = tv.tv_usec } );
os_write_file(tty_log_fd, &data, sizeof(data));
write(tty_log_fd, &data, sizeof(data));
return;
}
os_close_file(fd);
@ -98,10 +98,10 @@ static int log_chunk(int fd, const char *buf, int len)
try = (len > sizeof(chunk)) ? sizeof(chunk) : len;
missed = copy_from_user_proc(chunk, (char *) buf, try);
try -= missed;
n = os_write_file(fd, chunk, try);
n = write(fd, chunk, try);
if(n != try) {
if(n < 0)
return n;
return -errno;
return -EIO;
}
if(missed != 0)
@ -130,7 +130,7 @@ int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)
.direction = direction,
.sec = tv.tv_sec,
.usec = tv.tv_usec } );
os_write_file(tty_log_fd, &data, sizeof(data));
write(tty_log_fd, &data, sizeof(data));
}
return log_chunk(fd, buf, len);
@ -161,7 +161,7 @@ void log_exec(char **argv, void *tty)
.direction = 0,
.sec = tv.tv_sec,
.usec = tv.tv_usec } );
os_write_file(tty_log_fd, &data, sizeof(data));
write(tty_log_fd, &data, sizeof(data));
for(ptr = argv; ; ptr++){
if(copy_from_user_proc(&arg, ptr, sizeof(arg)))