[PATCH] uml: Fixes raw() and uses it in check_one_sigio; also fixes a silly panic...

Fixes raw() and uses it in check_one_sigio; also fixes a silly panic (EINTR
returned by call).

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

diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 588012843b7795c3d5769bbaad2073955ea2c5c2..20b70f42e1211236c9eba6172bfc4822b51a06a3 100644 (file)
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -62,7 +62,6 @@ extern void set_cmdline(char *cmd);
 extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
 extern int get_pty(void);
 extern void *um_kmalloc(int size);
-extern int raw(int fd, int complain);
 extern int switcheroo(int fd, int prot, void *from, void *to, int size);
 extern void setup_machinename(char *machine_out);
 extern void setup_hostinfo(void);
@@ -90,6 +89,9 @@ extern void forward_pending_sigio(int target);
 extern int can_do_skas(void);
 extern void arch_init_thread(void);
 
+extern int __raw(int fd, int complain, int now);
+#define raw(fd, complain) __raw((fd), (complain), 1)
+
 #endif
 
 /*

diff --git a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c
index 11cb14964ba62c0ef8f6844eb4d170c0cf354c11..de4fcb279d6e19386a3ea13bd063fd142d9e3546 100644 (file)
--- a/arch/um/kernel/sigio_user.c
+++ b/arch/um/kernel/sigio_user.c
@@ -16,6 +16,7 @@
 #include "init.h"
 #include "user.h"
 #include "kern_util.h"
+#include "user_util.h"
 #include "sigio.h"
 #include "helper.h"
 #include "os.h"
@@ -50,7 +51,6 @@ static void openpty_cb(void *arg)
 void __init check_one_sigio(void (*proc)(int, int))
 {
        struct sigaction old, new;
-       struct termios tt;
        struct openpty_arg pty = { .master = -1, .slave = -1 };
        int master, slave, err;
 
@@ -68,12 +68,9 @@ void __init check_one_sigio(void (*proc)(int, int))
                return;
        }
 
-       /* XXX These can fail with EINTR */
-       if(tcgetattr(master, &tt) < 0)
-               panic("check_sigio : tcgetattr failed, errno = %d\n", errno);
-       cfmakeraw(&tt);
-       if(tcsetattr(master, TCSADRAIN, &tt) < 0)
-               panic("check_sigio : tcsetattr failed, errno = %d\n", errno);
+       err = __raw(master, 1, 0); //Not now, but complain so we now where we failed.
+       if (err < 0)
+               panic("check_sigio : __raw failed, errno = %d\n", -err);
 
        err = os_sigio_async(master, slave);
        if(err < 0)

diff --git a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
index d646f1daf1214da27234048b7c3cccab422a7f99..fa1868ba2c7d7c75f897461e1db61a85478013a2 100644 (file)
--- a/arch/um/kernel/user_util.c
+++ b/arch/um/kernel/user_util.c
@@ -118,18 +118,37 @@ int wait_for_stop(int pid, int sig, int cont_type, void *relay)
        }
 }
 
-int raw(int fd, int complain)
+int __raw(int fd, int complain, int now)
 {
        struct termios tt;
        int err;
+       int when;
+
+       while (((err = tcgetattr(fd, &tt)) < 0) && errno == EINTR)
+               ;
+
+       if (err < 0) {
+               if (complain)
+                       printk("tcgetattr failed, errno = %d\n", errno);
+               return(-errno);
+       }
 
-       tcgetattr(fd, &tt);
        cfmakeraw(&tt);
-       err = tcsetattr(fd, TCSANOW, &tt);
-       if((err < 0) && complain){
-               printk("tcsetattr failed, errno = %d\n", errno);
+
+       if (now)
+               when = TCSANOW;
+       else
+               when = TCSADRAIN;
+
+       while (((err = tcsetattr(fd, when, &tt)) < 0) && errno == EINTR)
+               ;
+       if (err < 0) {
+               if (complain)
+                       printk("tcsetattr failed, errno = %d\n", errno);
                return(-errno);
        }
+       /*XXX: tcsetattr could have applied only some changes
+        * (and cfmakeraw() is a set of changes) */
        return(0);
 }