Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / um / drivers / ubd_user.c

diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index 4707b3f14c2fcf45029a0c4ae65d84bfad5004e8..48fc7452bc1d11e3f3aad9c40c6983dac8526fc9 100644 (file)
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -43,8 +43,13 @@ int start_io_thread(unsigned long sp, int *fd_out)
        kernel_fd = fds[0];
        *fd_out = fds[1];
 
-       pid = clone(io_thread, (void *) sp, CLONE_FILES | CLONE_VM | SIGCHLD,
-                   NULL);
+       err = os_set_fd_block(*fd_out, 0);
+       if (err) {
+               printk("start_io_thread - failed to set nonblocking I/O.\n");
+               goto out_close;
+       }
+
+       pid = clone(io_thread, (void *) sp, CLONE_FILES | CLONE_VM, NULL);
        if(pid < 0){
                err = -errno;
                printk("start_io_thread - clone failed : errno = %d\n", errno);