Commit 9ead6fee authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: add some EINTR protection

Add some more uses of the CATCH_EINTR wrapper.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 108ffa8c
......@@ -105,9 +105,7 @@ int net_recvfrom(int fd, void *buf, int len)
{
int n;
while(((n = recvfrom(fd, buf, len, 0, NULL, NULL)) < 0) &&
(errno == EINTR)) ;
CATCH_EINTR(n = recvfrom(fd, buf, len, 0, NULL, NULL));
if(n < 0){
if(errno == EAGAIN)
return 0;
......@@ -135,7 +133,7 @@ int net_send(int fd, void *buf, int len)
{
int n;
while(((n = send(fd, buf, len, 0)) < 0) && (errno == EINTR)) ;
CATCH_EINTR(n = send(fd, buf, len, 0));
if(n < 0){
if(errno == EAGAIN)
return 0;
......@@ -150,8 +148,8 @@ int net_sendto(int fd, void *buf, int len, void *to, int sock_len)
{
int n;
while(((n = sendto(fd, buf, len, 0, (struct sockaddr *) to,
sock_len)) < 0) && (errno == EINTR)) ;
CATCH_EINTR(n = sendto(fd, buf, len, 0, (struct sockaddr *) to,
sock_len));
if(n < 0){
if(errno == EAGAIN)
return 0;
......
......@@ -18,6 +18,7 @@
#include "os.h"
#include "user.h"
#include "kern_util.h"
#include "user_util.h"
static void copy_stat(struct uml_stat *dst, struct stat64 *src)
{
......@@ -42,10 +43,7 @@ int os_stat_fd(const int fd, struct uml_stat *ubuf)
struct stat64 sbuf;
int err;
do {
err = fstat64(fd, &sbuf);
} while((err < 0) && (errno == EINTR)) ;
CATCH_EINTR(err = fstat64(fd, &sbuf));
if(err < 0)
return -errno;
......
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