diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
| commit | 058250a0d5886b4d96a195ecc7e3a75e2df5e4b1 (patch) | |
| tree | fb67e8f5258c6aa11d4e8c39650e23de7556b38d /arch/um/os-Linux/file.c | |
| parent | cea218054ad277d6c126890213afde07b4eb1602 (diff) | |
| parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/os-Linux/file.c')
| -rw-r--r-- | arch/um/os-Linux/file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index b542a3a021bf..f83462758627 100644 --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c | |||
| @@ -496,8 +496,7 @@ int os_rcv_fd(int fd, int *helper_pid_out) | |||
| 496 | n = recvmsg(fd, &msg, 0); | 496 | n = recvmsg(fd, &msg, 0); |
| 497 | if(n < 0) | 497 | if(n < 0) |
| 498 | return -errno; | 498 | return -errno; |
| 499 | 499 | else if(n != iov.iov_len) | |
| 500 | else if(n != sizeof(iov.iov_len)) | ||
| 501 | *helper_pid_out = -1; | 500 | *helper_pid_out = -1; |
| 502 | 501 | ||
| 503 | cmsg = CMSG_FIRSTHDR(&msg); | 502 | cmsg = CMSG_FIRSTHDR(&msg); |