Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/git/gfs2...

[firefly-linux-kernel-4.4.55.git] / net / vmw_vsock / vmci_transport.c

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 7f3255084a6c036074664240f4da6fb3cdd231ce..1f63daff39659e08561862cfd71220ffc6949291 100644 (file)
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1022,7 +1022,7 @@ static int vmci_transport_recv_listen(struct sock *sk,
        }
 
        pending = __vsock_create(sock_net(sk), NULL, sk, GFP_KERNEL,
-                                sk->sk_type);
+                                sk->sk_type, 0);
        if (!pending) {
                vmci_transport_send_reset(sk, pkt);
                return -ENOMEM;
@@ -1730,8 +1730,7 @@ static int vmci_transport_dgram_enqueue(
        return err - sizeof(*dg);
 }
 
-static int vmci_transport_dgram_dequeue(struct kiocb *kiocb,
-                                       struct vsock_sock *vsk,
+static int vmci_transport_dgram_dequeue(struct vsock_sock *vsk,
                                        struct msghdr *msg, size_t len,
                                        int flags)
 {