Message ID | 20171205113114.3377-1-stefanha@redhat.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | VSOCK: fix outdated sk_state value in hvs_release() | expand |
> 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>
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.
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);
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(-)