netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] VSOCK: fix outdated sk_state value in hvs_release()
@ 2017-12-05 11:31 Stefan Hajnoczi
  2017-12-05 13:31 ` Jorgen S. Hansen
  2017-12-05 20:07 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2017-12-05 11:31 UTC (permalink / raw)
  To: netdev; +Cc: Jorgen Hansen, Stefan Hajnoczi, Dexuan Cui, Cathy Avery

Since commit 3b4477d2dcf2709d0be89e2a8dced3d0f4a017f2 ("VSOCK: use TCP
state constants for sk_state") VSOCK has used TCP_* constants for
sk_state.

Commit b4562ca7925a3bedada87a3dd072dd5bad043288 ("hv_sock: add locking
in the open/close/release code paths") reintroduced the SS_DISCONNECTING
constant.

This patch replaces the old SS_DISCONNECTING with the new TCP_CLOSING
constant.

CC: Dexuan Cui <decui@microsoft.com>
CC: Cathy Avery <cavery@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/vmw_vsock/hyperv_transport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
index 5583df708b8c..a827547aa102 100644
--- a/net/vmw_vsock/hyperv_transport.c
+++ b/net/vmw_vsock/hyperv_transport.c
@@ -487,7 +487,7 @@ static void hvs_release(struct vsock_sock *vsk)
 
 	lock_sock(sk);
 
-	sk->sk_state = SS_DISCONNECTING;
+	sk->sk_state = TCP_CLOSING;
 	vsock_remove_sock(vsk);
 
 	release_sock(sk);
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] VSOCK: fix outdated sk_state value in hvs_release()
  2017-12-05 11:31 [PATCH] VSOCK: fix outdated sk_state value in hvs_release() Stefan Hajnoczi
@ 2017-12-05 13:31 ` Jorgen S. Hansen
  2017-12-05 20:07 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Jorgen S. Hansen @ 2017-12-05 13:31 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: netdev@vger.kernel.org, Dexuan Cui, Cathy Avery


> On Dec 5, 2017, at 12:31 PM, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> 
> Since commit 3b4477d2dcf2709d0be89e2a8dced3d0f4a017f2 ("VSOCK: use TCP
> state constants for sk_state") VSOCK has used TCP_* constants for
> sk_state.
> 
> Commit b4562ca7925a3bedada87a3dd072dd5bad043288 ("hv_sock: add locking
> in the open/close/release code paths") reintroduced the SS_DISCONNECTING
> constant.
> 
> This patch replaces the old SS_DISCONNECTING with the new TCP_CLOSING
> constant.
> 
> CC: Dexuan Cui <decui@microsoft.com>
> CC: Cathy Avery <cavery@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> net/vmw_vsock/hyperv_transport.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
> index 5583df708b8c..a827547aa102 100644
> --- a/net/vmw_vsock/hyperv_transport.c
> +++ b/net/vmw_vsock/hyperv_transport.c
> @@ -487,7 +487,7 @@ static void hvs_release(struct vsock_sock *vsk)
> 
> 	lock_sock(sk);
> 
> -	sk->sk_state = SS_DISCONNECTING;
> +	sk->sk_state = TCP_CLOSING;
> 	vsock_remove_sock(vsk);
> 
> 	release_sock(sk);
> -- 
> 2.14.3
> 

Reviewed-by: Jorgen Hansen <jhansen@vmware.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] VSOCK: fix outdated sk_state value in hvs_release()
  2017-12-05 11:31 [PATCH] VSOCK: fix outdated sk_state value in hvs_release() Stefan Hajnoczi
  2017-12-05 13:31 ` Jorgen S. Hansen
@ 2017-12-05 20:07 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-12-05 20:07 UTC (permalink / raw)
  To: stefanha; +Cc: netdev, jhansen, decui, cavery

From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Tue,  5 Dec 2017 11:31:14 +0000

> Since commit 3b4477d2dcf2709d0be89e2a8dced3d0f4a017f2 ("VSOCK: use TCP
> state constants for sk_state") VSOCK has used TCP_* constants for
> sk_state.
> 
> Commit b4562ca7925a3bedada87a3dd072dd5bad043288 ("hv_sock: add locking
> in the open/close/release code paths") reintroduced the SS_DISCONNECTING
> constant.
> 
> This patch replaces the old SS_DISCONNECTING with the new TCP_CLOSING
> constant.
> 
> CC: Dexuan Cui <decui@microsoft.com>
> CC: Cathy Avery <cavery@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Applied.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-12-05 20:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-05 11:31 [PATCH] VSOCK: fix outdated sk_state value in hvs_release() Stefan Hajnoczi
2017-12-05 13:31 ` Jorgen S. Hansen
2017-12-05 20:07 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).