diff options
Diffstat (limited to 'app-emulation/vmware-modules/files/sk_sleep.patch')
| -rw-r--r-- | app-emulation/vmware-modules/files/sk_sleep.patch | 242 |
1 files changed, 0 insertions, 242 deletions
diff --git a/app-emulation/vmware-modules/files/sk_sleep.patch b/app-emulation/vmware-modules/files/sk_sleep.patch deleted file mode 100644 index 583b6c8..0000000 --- a/app-emulation/vmware-modules/files/sk_sleep.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -ru8 original//vsock-only/linux/af_vsock.c patched//vsock-only/linux/af_vsock.c ---- original//vsock-only/linux/af_vsock.c 2010-05-21 00:17:27.000000000 -0400 -+++ patched//vsock-only/linux/af_vsock.c 2010-06-15 23:48:52.000000000 -0400 -@@ -3216,17 +3216,17 @@ - } - - /* - * The receive path will handle all communication until we are able to enter - * the connected state. Here we wait for the connection to be completed or - * a notification of an error. - */ - timeout = sock_sndtimeo(sk, flags & O_NONBLOCK); -- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) { - if (timeout == 0) { - /* - * If we're not going to block, skip ahead to preserve error code set - * above. - */ - goto outWait; -@@ -3239,29 +3239,29 @@ - if (signal_pending(current)) { - err = sock_intr_errno(timeout); - goto outWaitError; - } else if (timeout == 0) { - err = -ETIMEDOUT; - goto outWaitError; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - } - - if (sk->compat_sk_err) { - err = -sk->compat_sk_err; - goto outWaitError; - } else { - ASSERT(sk->compat_sk_state == SS_CONNECTED); - err = 0; - } - - outWait: -- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; - - outWaitError: - sk->compat_sk_state = SS_UNCONNECTED; - sock->state = SS_UNCONNECTED; - goto outWait; -@@ -3311,33 +3311,33 @@ - goto out; - } - - /* - * Wait for children sockets to appear; these are the new sockets created - * upon connection establishment. - */ - timeout = sock_sndtimeo(listener, flags & O_NONBLOCK); -- compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); - - while ((connected = VSockVmciDequeueAccept(listener)) == NULL && - listener->compat_sk_err == 0) { - release_sock(listener); - timeout = schedule_timeout(timeout); - lock_sock(listener); - - if (signal_pending(current)) { - err = sock_intr_errno(timeout); - goto outWait; - } else if (timeout == 0) { - err = -EAGAIN; - goto outWait; - } - -- compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_cont_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); - } - - if (listener->compat_sk_err) { - err = -listener->compat_sk_err; - } - - if (connected) { - listener->compat_sk_ack_backlog--; -@@ -3361,17 +3361,17 @@ - - newsock->state = SS_CONNECTED; - sock_graft(connected, newsock); - release_sock(connected); - sock_put(connected); - } - - outWait: -- compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING); - out: - release_sock(listener); - return err; - } - - - /* - *---------------------------------------------------------------------------- -@@ -3459,17 +3459,17 @@ - { - struct sock *sk; - unsigned int mask; - VSockVmciSock *vsk; - - sk = sock->sk; - vsk = vsock_sk(sk); - -- poll_wait(file, sk->compat_sk_sleep, wait); -+ poll_wait(file, compat_sk_sleep(sk), wait); - mask = 0; - - if (sk->compat_sk_err) { - /* Signify that there has been an error on this socket. */ - mask |= POLLERR; - } - - /* -@@ -4099,17 +4099,17 @@ - */ - timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); - - NOTIFYCALLRET(vsk, err, sendInit, sk, &sendData); - if (err < 0) { - goto out; - } - -- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while (totalWritten < len) { - Bool sentWrote; - unsigned int retries; - ssize_t written; - - sentWrote = FALSE; - retries = 0; -@@ -4136,17 +4136,17 @@ - if (signal_pending(current)) { - err = sock_intr_errno(timeout); - goto outWait; - } else if (timeout == 0) { - err = -EAGAIN; - goto outWait; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), - &wait, TASK_INTERRUPTIBLE); - } - - /* - * These checks occur both as part of and after the loop conditional - * since we need to check before and after sleeping. - */ - if (sk->compat_sk_err) { -@@ -4189,17 +4189,17 @@ - } - - ASSERT(totalWritten <= INT_MAX); - - outWait: - if (totalWritten > 0) { - err = totalWritten; - } -- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; - } - - - /* - *---------------------------------------------------------------------------- -@@ -4423,17 +4423,17 @@ - timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); - copied = 0; - - NOTIFYCALLRET(vsk, err, recvInit, sk, target, &recvData); - if (err < 0) { - goto out; - } - -- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while ((ready = VSockVmciStreamHasData(vsk)) < target && - sk->compat_sk_err == 0 && - !(sk->compat_sk_shutdown & RCV_SHUTDOWN) && - !(vsk->peerShutdown & SEND_SHUTDOWN)) { - - if (ready < 0) { - /* -@@ -4463,17 +4463,17 @@ - if (signal_pending(current)) { - err = sock_intr_errno(timeout); - goto outWait; - } else if (timeout == 0) { - err = -EAGAIN; - goto outWait; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - } - - if (sk->compat_sk_err) { - err = -sk->compat_sk_err; - goto outWait; - } else if (sk->compat_sk_shutdown & RCV_SHUTDOWN) { - err = 0; - goto outWait; -@@ -4529,17 +4529,17 @@ - if (err < 0) { - goto outWait; - } - - ASSERT(copied <= INT_MAX); - err = copied; - - outWait: -- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; - } - - - /* - * Protocol operation. |