[PATCH] uml: add some EINTR protection

Add some more uses of the CATCH_EINTR wrapper.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 8cd851be0e4d..107c5e43fa00 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -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;