| Message ID | 20210618133526.300347-1-sgarzare@redhat.com |
|---|---|
| Headers | show |
| Series | vsock: small fixes for seqpacket support | expand |
On 18.06.2021 16:35, Stefano Garzarella wrote: > vsock_has_data() is used only by STREAM and SEQPACKET sockets, > so let's rename it to vsock_connectible_has_data(), using the same > nomenclature (connectible) used in other functions after the > introduction of SEQPACKET. > > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> > --- > net/vmw_vsock/af_vsock.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c > index 67954afef4e1..de8249483081 100644 > --- a/net/vmw_vsock/af_vsock.c > +++ b/net/vmw_vsock/af_vsock.c > @@ -860,7 +860,7 @@ s64 vsock_stream_has_data(struct vsock_sock *vsk) > } > EXPORT_SYMBOL_GPL(vsock_stream_has_data); > > -static s64 vsock_has_data(struct vsock_sock *vsk) > +static s64 vsock_connectible_has_data(struct vsock_sock *vsk) > { > struct sock *sk = sk_vsock(vsk); > > @@ -1880,7 +1880,7 @@ static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait, > err = 0; > transport = vsk->transport; > > - while ((data = vsock_has_data(vsk)) == 0) { > + while ((data = vsock_connectible_has_data(vsk)) == 0) { > prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE); > > if (sk->sk_err != 0 || LGTM
Hello: This series was applied to netdev/net-next.git (refs/heads/master): On Fri, 18 Jun 2021 15:35:23 +0200 you wrote: > This series contains few patches to clean up a bit the code > of seqpacket recently merged in the net-next tree. > > No functionality changes. > > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> > > [...] Here is the summary with links: - [net-next,1/3] vsock: rename vsock_has_data() https://git.kernel.org/netdev/net-next/c/cc97141afd76 - [net-next,2/3] vsock: rename vsock_wait_data() https://git.kernel.org/netdev/net-next/c/0de5b2e67275 - [net-next,3/3] vsock/virtio: remove redundant `copy_failed` variable https://git.kernel.org/netdev/net-next/c/91aa49a8fa0f You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
This series contains few patches to clean up a bit the code of seqpacket recently merged in the net-next tree. No functionality changes. Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> Stefano Garzarella (3): vsock: rename vsock_has_data() vsock: rename vsock_wait_data() vsock/virtio: remove redundant `copy_failed` variable net/vmw_vsock/af_vsock.c | 18 ++++++++++-------- net/vmw_vsock/virtio_transport_common.c | 7 ++----- 2 files changed, 12 insertions(+), 13 deletions(-)