2007-12-23 20:01:21

by Al Viro

Subject: [PATCH] uml: user of helper_wait() got missed when it got extra arguments

Signed-off-by: Al Viro <[email protected]>
---
arch/um/drivers/harddog_user.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
index b56f8e0..448ba59 100644
--- a/arch/um/drivers/harddog_user.c
+++ b/arch/um/drivers/harddog_user.c
@@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
n = read(in_fds[0], &c, sizeof(c));
if (n == 0) {
printk("harddog_open - EOF on watchdog pipe\n");
- helper_wait(pid);
+ helper_wait(pid, 1, NULL);
err = -EIO;
goto out_close_out;
}
else if (n < 0) {
printk("harddog_open - read of watchdog pipe failed, "
"err = %d\n", errno);
- helper_wait(pid);
+ helper_wait(pid, 1, NULL);
err = n;
goto out_close_out;
}
--
1.5.3.GIT

2008-01-02 15:09:49

by Jeff Dike

Subject: Re: [PATCH] uml: user of helper_wait() got missed when it got extra arguments

On Sun, Dec 23, 2007 at 08:01:04PM +0000, Al Viro wrote:
> - helper_wait(pid);
> + helper_wait(pid, 1, NULL);

Thanks.

I know I fixed these - I probably forgot to quilt add the file.

Jeff

--
Work email - jdike at linux dot intel dot com