diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 11:27:45 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 11:27:45 -0400 |
| commit | 092c140646f5f7863ab7fbaacab75ac5ededc5e0 (patch) | |
| tree | 9172bf1d5d3bca4c9c82cab32a95bcde2039497f | |
| parent | b48e2674d7a9d5abdd01df35f167088eec52d147 (diff) | |
| download | longterm-queue-4.18-092c140646f5f7863ab7fbaacab75ac5ededc5e0.tar.gz | |
vhost: ctxt refresh for lock type change
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch b/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch index cbd9cae..cf96dc2 100644 --- a/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch +++ b/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch @@ -1,4 +1,4 @@ -From 7fbe078c37aba3088359c9256c1a1d0c3e39ee81 Mon Sep 17 00:00:00 2001 +From c455a7d62352d7e0cf2e9f13c84b937bd9bf24ed Mon Sep 17 00:00:00 2001 From: Zha Bin <zhabin@linux.alibaba.com> Date: Tue, 8 Jan 2019 16:07:03 +0800 Subject: [PATCH] vhost/vsock: fix vhost vsock cid hashing inconsistent @@ -38,7 +38,7 @@ Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c -index bc42d38ae031..3fbc068eaa9b 100644 +index 98ed5be132c6..64b96f426768 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -642,7 +642,7 @@ static int vhost_vsock_set_cid(struct vhost_vsock *vsock, u64 guest_cid) @@ -47,7 +47,7 @@ index bc42d38ae031..3fbc068eaa9b 100644 vsock->guest_cid = guest_cid; - hash_add_rcu(vhost_vsock_hash, &vsock->hash, guest_cid); + hash_add_rcu(vhost_vsock_hash, &vsock->hash, vsock->guest_cid); - mutex_unlock(&vhost_vsock_mutex); + spin_unlock_bh(&vhost_vsock_lock); return 0; -- |