Commit ef0470c0 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

uml: tidy libc code

This patch lays some groundwork for the next one, which converts calls to
os_{read,write}_file into {read,write}, by doing some tidying in the affected
areas.

do_not_aio gets restructured to make the final result a bit cleaner.

There are also whitespace and other formatting fixes, fixes in error messages,
and a typo fix.
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d564047
...@@ -146,28 +146,21 @@ static int aio_thread(void *arg) ...@@ -146,28 +146,21 @@ static int aio_thread(void *arg)
static int do_not_aio(struct aio_thread_req *req) static int do_not_aio(struct aio_thread_req *req)
{ {
char c; char c;
unsigned long long actual;
int err; int err;
actual = lseek64(req->io_fd, req->offset, SEEK_SET);
if(actual != req->offset)
return -errno;
switch(req->type){ switch(req->type){
case AIO_READ: case AIO_READ:
err = os_seek_file(req->io_fd, req->offset);
if(err)
goto out;
err = os_read_file(req->io_fd, req->buf, req->len); err = os_read_file(req->io_fd, req->buf, req->len);
break; break;
case AIO_WRITE: case AIO_WRITE:
err = os_seek_file(req->io_fd, req->offset);
if(err)
goto out;
err = os_write_file(req->io_fd, req->buf, req->len); err = os_write_file(req->io_fd, req->buf, req->len);
break; break;
case AIO_MMAP: case AIO_MMAP:
err = os_seek_file(req->io_fd, req->offset);
if(err)
goto out;
err = os_read_file(req->io_fd, &c, sizeof(c)); err = os_read_file(req->io_fd, &c, sizeof(c));
break; break;
default: default:
...@@ -176,7 +169,6 @@ static int do_not_aio(struct aio_thread_req *req) ...@@ -176,7 +169,6 @@ static int do_not_aio(struct aio_thread_req *req)
break; break;
} }
out:
return err; return err;
} }
...@@ -207,7 +199,7 @@ static int not_aio_thread(void *arg) ...@@ -207,7 +199,7 @@ static int not_aio_thread(void *arg)
} }
err = do_not_aio(&req); err = do_not_aio(&req);
reply = ((struct aio_thread_reply) { .data = req.aio, reply = ((struct aio_thread_reply) { .data = req.aio,
.err = err }); .err = err });
err = os_write_file(req.aio->reply_fd, &reply, sizeof(reply)); err = os_write_file(req.aio->reply_fd, &reply, sizeof(reply));
if(err != sizeof(reply)) if(err != sizeof(reply))
printk("not_aio_thread - write failed, fd = %d, " printk("not_aio_thread - write failed, fd = %d, "
......
/* /*
* Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
* James Leu (jleu@mindspring.net). * James Leu (jleu@mindspring.net).
* Copyright (C) 2001 by various other people who didn't put their name here. * Copyright (C) 2001 by various other people who didn't put their name here.
* Licensed under the GPL. * Licensed under the GPL.
...@@ -49,8 +49,11 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask, ...@@ -49,8 +49,11 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
memcpy(change.addr, addr, sizeof(change.addr)); memcpy(change.addr, addr, sizeof(change.addr));
memcpy(change.netmask, netmask, sizeof(change.netmask)); memcpy(change.netmask, netmask, sizeof(change.netmask));
n = os_write_file(fd, &change, sizeof(change)); n = os_write_file(fd, &change, sizeof(change));
if(n != sizeof(change)) if(n != sizeof(change)){
printk("etap_change - request failed, err = %d\n", -n); printk("etap_change - request failed, err = %d\n", -n);
return;
}
output = um_kmalloc(UM_KERN_PAGE_SIZE); output = um_kmalloc(UM_KERN_PAGE_SIZE);
if(output == NULL) if(output == NULL)
printk("etap_change : Failed to allocate output buffer\n"); printk("etap_change : Failed to allocate output buffer\n");
...@@ -116,7 +119,8 @@ static int etap_tramp(char *dev, char *gate, int control_me, ...@@ -116,7 +119,8 @@ static int etap_tramp(char *dev, char *gate, int control_me,
pe_data.data_me = data_me; pe_data.data_me = data_me;
pid = run_helper(etap_pre_exec, &pe_data, args, NULL); pid = run_helper(etap_pre_exec, &pe_data, args, NULL);
if(pid < 0) err = pid; if(pid < 0)
err = pid;
os_close_file(data_remote); os_close_file(data_remote);
os_close_file(control_remote); os_close_file(control_remote);
n = os_read_file(control_me, &c, sizeof(c)); n = os_read_file(control_me, &c, sizeof(c));
......
...@@ -34,7 +34,8 @@ static int helper_child(void *arg) ...@@ -34,7 +34,8 @@ static int helper_child(void *arg)
if (data->pre_exec != NULL) if (data->pre_exec != NULL)
(*data->pre_exec)(data->pre_data); (*data->pre_exec)(data->pre_data);
errval = execvp_noalloc(data->buf, argv[0], argv); errval = execvp_noalloc(data->buf, argv[0], argv);
printk("helper_child - execvp of '%s' failed - errno = %d\n", argv[0], -errval); printk("helper_child - execvp of '%s' failed - errno = %d\n", argv[0],
-errval);
os_write_file(data->fd, &errval, sizeof(errval)); os_write_file(data->fd, &errval, sizeof(errval));
kill(os_getpid(), SIGKILL); kill(os_getpid(), SIGKILL);
return 0; return 0;
...@@ -87,8 +88,10 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -87,8 +88,10 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
close(fds[1]); close(fds[1]);
fds[1] = -1; fds[1] = -1;
/* Read the errno value from the child, if the exec failed, or get 0 if /*
* the exec succeeded because the pipe fd was set as close-on-exec. */ * Read the errno value from the child, if the exec failed, or get 0 if
* the exec succeeded because the pipe fd was set as close-on-exec.
*/
n = os_read_file(fds[0], &ret, sizeof(ret)); n = os_read_file(fds[0], &ret, sizeof(ret));
if (n == 0) { if (n == 0) {
ret = pid; ret = pid;
......
...@@ -40,14 +40,14 @@ unsigned long os_process_pc(int pid) ...@@ -40,14 +40,14 @@ unsigned long os_process_pc(int pid)
if(fd < 0){ if(fd < 0){
printk("os_process_pc - couldn't open '%s', err = %d\n", printk("os_process_pc - couldn't open '%s', err = %d\n",
proc_stat, -fd); proc_stat, -fd);
return(ARBITRARY_ADDR); return ARBITRARY_ADDR;
} }
err = os_read_file(fd, buf, sizeof(buf)); err = os_read_file(fd, buf, sizeof(buf));
if(err < 0){ if(err < 0){
printk("os_process_pc - couldn't read '%s', err = %d\n", printk("os_process_pc - couldn't read '%s', err = %d\n",
proc_stat, -err); proc_stat, -err);
os_close_file(fd); os_close_file(fd);
return(ARBITRARY_ADDR); return ARBITRARY_ADDR;
} }
os_close_file(fd); os_close_file(fd);
pc = ARBITRARY_ADDR; pc = ARBITRARY_ADDR;
...@@ -56,7 +56,7 @@ unsigned long os_process_pc(int pid) ...@@ -56,7 +56,7 @@ unsigned long os_process_pc(int pid)
"%*d %*d %*d %*d %*d %lu", &pc) != 1){ "%*d %*d %*d %*d %*d %lu", &pc) != 1){
printk("os_process_pc - couldn't find pc in '%s'\n", buf); printk("os_process_pc - couldn't find pc in '%s'\n", buf);
} }
return(pc); return pc;
} }
int os_process_parent(int pid) int os_process_parent(int pid)
...@@ -65,13 +65,14 @@ int os_process_parent(int pid) ...@@ -65,13 +65,14 @@ int os_process_parent(int pid)
char data[256]; char data[256];
int parent, n, fd; int parent, n, fd;
if(pid == -1) return(-1); if(pid == -1)
return -1;
snprintf(stat, sizeof(stat), "/proc/%d/stat", pid); snprintf(stat, sizeof(stat), "/proc/%d/stat", pid);
fd = os_open_file(stat, of_read(OPENFLAGS()), 0); fd = os_open_file(stat, of_read(OPENFLAGS()), 0);
if(fd < 0){ if(fd < 0){
printk("Couldn't open '%s', err = %d\n", stat, -fd); printk("Couldn't open '%s', err = %d\n", stat, -fd);
return(FAILURE_PID); return FAILURE_PID;
} }
n = os_read_file(fd, data, sizeof(data)); n = os_read_file(fd, data, sizeof(data));
...@@ -79,7 +80,7 @@ int os_process_parent(int pid) ...@@ -79,7 +80,7 @@ int os_process_parent(int pid)
if(n < 0){ if(n < 0){
printk("Couldn't read '%s', err = %d\n", stat, -n); printk("Couldn't read '%s', err = %d\n", stat, -n);
return(FAILURE_PID); return FAILURE_PID;
} }
parent = FAILURE_PID; parent = FAILURE_PID;
...@@ -87,7 +88,7 @@ int os_process_parent(int pid) ...@@ -87,7 +88,7 @@ int os_process_parent(int pid)
if(n != 1) if(n != 1)
printk("Failed to scan '%s'\n", data); printk("Failed to scan '%s'\n", data);
return(parent); return parent;
} }
void os_stop_process(int pid) void os_stop_process(int pid)
...@@ -145,7 +146,7 @@ void os_usr1_process(int pid) ...@@ -145,7 +146,7 @@ void os_usr1_process(int pid)
int os_getpid(void) int os_getpid(void)
{ {
return(syscall(__NR_getpid)); return syscall(__NR_getpid);
} }
int os_getpgrp(void) int os_getpgrp(void)
...@@ -165,8 +166,8 @@ int os_map_memory(void *virt, int fd, unsigned long long off, unsigned long len, ...@@ -165,8 +166,8 @@ int os_map_memory(void *virt, int fd, unsigned long long off, unsigned long len,
loc = mmap64((void *) virt, len, prot, MAP_SHARED | MAP_FIXED, loc = mmap64((void *) virt, len, prot, MAP_SHARED | MAP_FIXED,
fd, off); fd, off);
if(loc == MAP_FAILED) if(loc == MAP_FAILED)
return(-errno); return -errno;
return(0); return 0;
} }
int os_protect_memory(void *addr, unsigned long len, int r, int w, int x) int os_protect_memory(void *addr, unsigned long len, int r, int w, int x)
...@@ -175,8 +176,8 @@ int os_protect_memory(void *addr, unsigned long len, int r, int w, int x) ...@@ -175,8 +176,8 @@ int os_protect_memory(void *addr, unsigned long len, int r, int w, int x)
(x ? PROT_EXEC : 0)); (x ? PROT_EXEC : 0));
if(mprotect(addr, len, prot) < 0) if(mprotect(addr, len, prot) < 0)
return(-errno); return -errno;
return(0); return 0;
} }
int os_unmap_memory(void *addr, int len) int os_unmap_memory(void *addr, int len)
...@@ -185,8 +186,8 @@ int os_unmap_memory(void *addr, int len) ...@@ -185,8 +186,8 @@ int os_unmap_memory(void *addr, int len)
err = munmap(addr, len); err = munmap(addr, len);
if(err < 0) if(err < 0)
return(-errno); return -errno;
return(0); return 0;
} }
#ifndef MADV_REMOVE #ifndef MADV_REMOVE
......
...@@ -461,15 +461,16 @@ static void tty_output(int master, int slave) ...@@ -461,15 +461,16 @@ static void tty_output(int master, int slave)
while(os_write_file(master, buf, sizeof(buf)) > 0) ; while(os_write_file(master, buf, sizeof(buf)) > 0) ;
if(errno != EAGAIN) if(errno != EAGAIN)
panic("check_sigio : write failed, errno = %d\n", errno); panic("tty_output : write failed, errno = %d\n", errno);
while(((n = os_read_file(slave, buf, sizeof(buf))) > 0) && !got_sigio) ; while(((n = os_read_file(slave, buf, sizeof(buf))) > 0) && !got_sigio) ;
if(got_sigio){ if(got_sigio){
printk("Yes\n"); printk("Yes\n");
pty_output_sigio = 1; pty_output_sigio = 1;
} }
else if(n == -EAGAIN) printk("No, enabling workaround\n"); else if(n == -EAGAIN)
else panic("check_sigio : read failed, err = %d\n", n); printk("No, enabling workaround\n");
else panic("tty_output : read failed, err = %d\n", n);
} }
static void tty_close(int master, int slave) static void tty_close(int master, int slave)
......
...@@ -409,7 +409,7 @@ int copy_context_skas0(unsigned long new_stack, int pid) ...@@ -409,7 +409,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
/* /*
* This is used only, if stub pages are needed, while proc_mm is * This is used only, if stub pages are needed, while proc_mm is
* availabl. Opening /proc/mm creates a new mm_context, which lacks * available. Opening /proc/mm creates a new mm_context, which lacks
* the stub-pages. Thus, we map them using /proc/mm-fd * the stub-pages. Thus, we map them using /proc/mm-fd
*/ */
void map_stub_pages(int fd, unsigned long code, void map_stub_pages(int fd, unsigned long code,
......
...@@ -55,7 +55,7 @@ int open_tty_log(void *tty, void *current_tty) ...@@ -55,7 +55,7 @@ int open_tty_log(void *tty, void *current_tty)
.usec = tv.tv_usec } ); .usec = tv.tv_usec } );
os_write_file(tty_log_fd, &data, sizeof(data)); os_write_file(tty_log_fd, &data, sizeof(data));
os_write_file(tty_log_fd, &current_tty, data.len); os_write_file(tty_log_fd, &current_tty, data.len);
return(tty_log_fd); return tty_log_fd;
} }
sprintf(buf, "%s/%0u-%0u", tty_log_dir, (unsigned int) tv.tv_sec, sprintf(buf, "%s/%0u-%0u", tty_log_dir, (unsigned int) tv.tv_sec,
...@@ -67,7 +67,7 @@ int open_tty_log(void *tty, void *current_tty) ...@@ -67,7 +67,7 @@ int open_tty_log(void *tty, void *current_tty)
printk("open_tty_log : couldn't open '%s', errno = %d\n", printk("open_tty_log : couldn't open '%s', errno = %d\n",
buf, -fd); buf, -fd);
} }
return(fd); return fd;
} }
void close_tty_log(int fd, void *tty) void close_tty_log(int fd, void *tty)
...@@ -101,18 +101,18 @@ static int log_chunk(int fd, const char *buf, int len) ...@@ -101,18 +101,18 @@ static int log_chunk(int fd, const char *buf, int len)
n = os_write_file(fd, chunk, try); n = os_write_file(fd, chunk, try);
if(n != try) { if(n != try) {
if(n < 0) if(n < 0)
return(n); return n;
return(-EIO); return -EIO;
} }
if(missed != 0) if(missed != 0)
return(-EFAULT); return -EFAULT;
len -= try; len -= try;
total += try; total += try;
buf += try; buf += try;
} }
return(total); return total;
} }
int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read) int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)
...@@ -133,7 +133,7 @@ int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read) ...@@ -133,7 +133,7 @@ int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)
os_write_file(tty_log_fd, &data, sizeof(data)); os_write_file(tty_log_fd, &data, sizeof(data));
} }
return(log_chunk(fd, buf, len)); return log_chunk(fd, buf, len);
} }
void log_exec(char **argv, void *tty) void log_exec(char **argv, void *tty)
...@@ -179,7 +179,7 @@ extern void register_tty_logger(int (*opener)(void *, void *), ...@@ -179,7 +179,7 @@ extern void register_tty_logger(int (*opener)(void *, void *),
static int register_logger(void) static int register_logger(void)
{ {
register_tty_logger(open_tty_log, write_tty_log, close_tty_log); register_tty_logger(open_tty_log, write_tty_log, close_tty_log);
return(0); return 0;
} }
__uml_initcall(register_logger); __uml_initcall(register_logger);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment