SHARE
TWEET

Untitled

a guest Nov 24th, 2015 175 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -rupN vsock-only/linux/af_vsock.c vsock-only-c/linux/af_vsock.c
  2. --- vsock-only/linux/af_vsock.c 2015-11-24 22:10:45.393933681 +0100
  3. +++ vsock-only-c/linux/af_vsock.c       2015-11-24 22:03:18.600857648 +0100
  4. @@ -232,13 +232,11 @@ static int VSockVmciStreamSetsockopt(str
  5.  static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
  6.                                       char __user *optval, int __user * optlen);
  7.  
  8. -static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
  9. -                                 struct socket *sock, struct msghdr *msg, size_t len);
  10. -static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
  11. +static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
  12. +static int VSockVmciDgramRecvmsg(struct socket *sock,
  13.                                   struct msghdr *msg, size_t len, int flags);
  14. -static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
  15. -                                 struct socket *sock, struct msghdr *msg, size_t len);
  16. -static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
  17. +static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
  18. +static int VSockVmciStreamRecvmsg(struct socket *sock,
  19.                                   struct msghdr *msg, size_t len, int flags);
  20.  
  21.  static int VSockVmciCreate(
  22. @@ -4210,8 +4208,7 @@ VSockVmciShutdown(struct socket *sock,
  23.   */
  24.  
  25.  static int
  26. -VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
  27. -                      struct socket *sock,          // IN: socket to send on
  28. +VSockVmciDgramSendmsg(struct socket *sock,          // IN: socket to send on
  29.                        struct msghdr *msg,           // IN: message to send
  30.                        size_t len)                   // IN: length of message
  31.  {
  32. @@ -4540,8 +4537,7 @@ VSockVmciStreamGetsockopt(struct socket
  33.   */
  34.  
  35.  static int
  36. -VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
  37. -                       struct socket *sock,          // IN: socket to send on
  38. +VSockVmciStreamSendmsg(struct socket *sock,          // IN: socket to send on
  39.                         struct msghdr *msg,           // IN: message to send
  40.                         size_t len)                   // IN: length of message
  41.  {
  42. @@ -4709,8 +4705,7 @@ out:
  43.   */
  44.  
  45.  static int
  46. -VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
  47. -                      struct socket *sock,          // IN: socket to receive from
  48. +VSockVmciDgramRecvmsg(struct socket *sock,          // IN: socket to receive from
  49.                        struct msghdr *msg,           // IN/OUT: message to receive into
  50.                        size_t len,                   // IN: length of receive buffer
  51.                        int flags)                    // IN: receive flags
  52. @@ -4804,8 +4799,7 @@ out:
  53.   */
  54.  
  55.  static int
  56. -VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
  57. -                       struct socket *sock,          // IN: socket to receive from
  58. +VSockVmciStreamRecvmsg(struct socket *sock,          // IN: socket to receive from
  59.                         struct msghdr *msg,           // IN/OUT: message to receive into
  60.                         size_t len,                   // IN: length of receive buffer
  61.                         int flags)                    // IN: receive flags
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top