git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
um
/
drivers
/
harddog_user.c
diff --git
a/arch/um/drivers/harddog_user.c
b/arch/um/drivers/harddog_user.c
index
cbbf41b
..
d934181
100644
(file)
--- a/
arch/um/drivers/harddog_user.c
+++ b/
arch/um/drivers/harddog_user.c
@@
-27,10
+27,10
@@
static void pre_exec(void *d)
dup2(data->stdin, 0);
dup2(data->stdout, 1);
dup2(data->stdout, 2);
dup2(data->stdin, 0);
dup2(data->stdout, 1);
dup2(data->stdout, 2);
-
clos
e(data->stdin);
-
clos
e(data->stdout);
-
clos
e(data->close_me[0]);
-
clos
e(data->close_me[1]);
+
os_close_fil
e(data->stdin);
+
os_close_fil
e(data->stdout);
+
os_close_fil
e(data->close_me[0]);
+
os_close_fil
e(data->close_me[1]);
}
int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
}
int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
@@
-44,15
+44,15
@@
int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
char **args = NULL;
err = os_pipe(in_fds, 1, 0);
char **args = NULL;
err = os_pipe(in_fds, 1, 0);
- if(err){
- printk("harddog_open - os_pipe failed, err
no
= %d\n", -err);
-
return(err)
;
+ if(err
< 0
){
+ printk("harddog_open - os_pipe failed, err = %d\n", -err);
+
goto out
;
}
err = os_pipe(out_fds, 1, 0);
}
err = os_pipe(out_fds, 1, 0);
- if(err){
- printk("harddog_open - os_pipe failed, err
no
= %d\n", -err);
-
return(err)
;
+ if(err
< 0
){
+ printk("harddog_open - os_pipe failed, err = %d\n", -err);
+
goto out_close_in
;
}
data.stdin = out_fds[0];
}
data.stdin = out_fds[0];
@@
-72,42
+72,47
@@
int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
pid = run_helper(pre_exec, &data, args, NULL);
pid = run_helper(pre_exec, &data, args, NULL);
-
clos
e(out_fds[0]);
-
clos
e(in_fds[1]);
+
os_close_fil
e(out_fds[0]);
+
os_close_fil
e(in_fds[1]);
if(pid < 0){
err = -pid;
if(pid < 0){
err = -pid;
- printk("harddog_open - run_helper failed, errno = %d\n", err);
- goto out;
+ printk("harddog_open - run_helper failed, errno = %d\n",
-
err);
+ goto out
_close_out
;
}
}
- n =
read
(in_fds[0], &c, sizeof(c));
+ n =
os_read_file
(in_fds[0], &c, sizeof(c));
if(n == 0){
printk("harddog_open - EOF on watchdog pipe\n");
helper_wait(pid);
err = -EIO;
if(n == 0){
printk("harddog_open - EOF on watchdog pipe\n");
helper_wait(pid);
err = -EIO;
- goto out;
+ goto out
_close_out
;
}
else if(n < 0){
printk("harddog_open - read of watchdog pipe failed, "
}
else if(n < 0){
printk("harddog_open - read of watchdog pipe failed, "
- "err
no = %d\n", errno
);
+ "err
= %d\n", -n
);
helper_wait(pid);
helper_wait(pid);
- err =
-errno
;
- goto out;
+ err =
n
;
+ goto out
_close_out
;
}
*in_fd_ret = in_fds[0];
*out_fd_ret = out_fds[1];
return(0);
}
*in_fd_ret = in_fds[0];
*out_fd_ret = out_fds[1];
return(0);
+
+ out_close_in:
+ os_close_file(in_fds[0]);
+ os_close_file(in_fds[1]);
+ out_close_out:
+ os_close_file(out_fds[0]);
+ os_close_file(out_fds[1]);
out:
out:
- close(out_fds[1]);
- close(in_fds[0]);
return(err);
}
void stop_watchdog(int in_fd, int out_fd)
{
return(err);
}
void stop_watchdog(int in_fd, int out_fd)
{
-
clos
e(in_fd);
-
clos
e(out_fd);
+
os_close_fil
e(in_fd);
+
os_close_fil
e(out_fd);
}
int ping_watchdog(int fd)
}
int ping_watchdog(int fd)
@@
-115,11
+120,12
@@
int ping_watchdog(int fd)
int n;
char c = '\n';
int n;
char c = '\n';
- n = write(fd, &c, sizeof(c));
- if(n < sizeof(c)){
- printk("ping_watchdog - write failed, errno = %d\n",
- errno);
- return(-errno);
+ n = os_write_file(fd, &c, sizeof(c));
+ if(n != sizeof(c)){
+ printk("ping_watchdog - write failed, err = %d\n", -n);
+ if(n < 0)
+ return(n);
+ return(-EIO);
}
return 1;
}
return 1;