sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

smbd: Properly handle EINTR in vfs_aio_fork

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke
2014-12-31 14:27:03 +01:00
committed by Jeremy Allison
parent 4b1e6ae5d3
commit 0f6bf3575e
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source3/modules/vfs_aio_fork.c
View File

@ -170,8 +170,12 @@ static ssize_t read_fd(int fd, void *ptr, size_t nbytes, int *recvfd)
msg.msg_iov = iov;
msg.msg_iovlen = 1;
if ( (n = recvmsg(fd, &msg, 0)) <= 0) {
return(n);
do {
n = recvmsg(fd, &msg, 0);
} while ((n == -1) && (errno == EINTR));
if (n <= 0) {
return n;
}
{
@ -203,6 +207,7 @@ static ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd)
size_t bufsize = msghdr_prep_fds(NULL, NULL, 0, &sendfd, 1);
uint8_t buf[bufsize];
struct iovec iov;
ssize_t sent;
msghdr_prep_fds(&msg, buf, bufsize, &sendfd, 1);
msg.msg_name = NULL;
@ -213,7 +218,11 @@ static ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd)
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
return (sendmsg(fd, &msg, 0));
do {
sent = sendmsg(fd, &msg, 0);
} while ((sent == -1) && (errno == EINTR));
return sent;
}
static void aio_child_cleanup(struct tevent_context *event_ctx,