[NET]: Use size_t for size argument in {send,recv}msg callchain.

diff --git a/include/linux/net.h b/include/linux/net.h
index 6f9a0992e578cf18b33037b186fce2e6a3549a93..859c519eda8d10803d83d6d4b16fa597a3f43c5e 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -120,9 +120,9 @@ struct proto_ops {
        int             (*getsockopt)(struct socket *sock, int level,
                                      int optname, char __user *optval, int __user *optlen);
        int             (*sendmsg)   (struct kiocb *iocb, struct socket *sock,
-                                     struct msghdr *m, int total_len);
+                                     struct msghdr *m, size_t total_len);
        int             (*recvmsg)   (struct kiocb *iocb, struct socket *sock,
-                                     struct msghdr *m, int total_len,
+                                     struct msghdr *m, size_t total_len,
                                      int flags);
        int             (*mmap)      (struct file *file, struct socket *sock,
                                      struct vm_area_struct * vma);
@@ -151,13 +151,13 @@ extern int             sock_create(int family, int type, int proto,
                                 struct socket **res);
 extern void         sock_release(struct socket *sock);
 extern int          sock_sendmsg(struct socket *sock, struct msghdr *msg,
-                                 int len);
+                                 size_t len);
 extern int          sock_recvmsg(struct socket *sock, struct msghdr *msg,
-                                 int size, int flags);
+                                 size_t size, int flags);
 extern int          sock_readv_writev(int type, struct inode *inode,
                                       struct file *file,
                                       const struct iovec *iov, long count,
-                                      long size);
+                                      size_t size);
 extern int          sock_map_fd(struct socket *sock);
 extern struct socket *sockfd_lookup(int fd, int *err);
 #define                     sockfd_put(sock) fput(sock->file)
@@ -216,9 +216,9 @@ SOCKCALL_WRAP(name, setsockopt, (struct socket *sock, int level, int optname, \
                         char *optval, int optlen), (sock, level, optname, optval, optlen)) \
 SOCKCALL_WRAP(name, getsockopt, (struct socket *sock, int level, int optname, \
                         char *optval, int *optlen), (sock, level, optname, optval, optlen)) \
-SOCKCALL_WRAP(name, sendmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, int len), \
+SOCKCALL_WRAP(name, sendmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t len), \
              (iocb, sock, m, len)) \
-SOCKCALL_WRAP(name, recvmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, int len, int flags), \
+SOCKCALL_WRAP(name, recvmsg, (struct kiocb *iocb, struct socket *sock, struct msghdr *m, size_t len, int flags), \
              (iocb, sock, m, len, flags)) \
 SOCKCALL_WRAP(name, mmap, (struct file *file, struct socket *sock, struct vm_area_struct *vma), \
              (file, sock, vma)) \

diff --git a/include/net/sock.h b/include/net/sock.h
index 1d85a3e5a3ccf35a94930cc5029e43a1ac1a4c1f..e2dc8c473482f7878183685b7b9046cf0414bb6f 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -418,10 +418,10 @@ struct proto {
                                        int optname, char *optval, 
                                        int *option);    
        int                     (*sendmsg)(struct kiocb *iocb, struct sock *sk,
-                                          struct msghdr *msg, int len);
+                                          struct msghdr *msg, size_t len);
        int                     (*recvmsg)(struct kiocb *iocb, struct sock *sk,
                                           struct msghdr *msg,
-                                       int len, int noblock, int flags, 
+                                       size_t len, int noblock, int flags, 
                                        int *addr_len);
        int                     (*sendpage)(struct sock *sk, struct page *page,
                                        int offset, size_t size, int flags);
@@ -609,9 +609,9 @@ extern int                  sock_no_getsockopt(struct socket *, int , int,
 extern int                     sock_no_setsockopt(struct socket *, int, int,
                                                   char *, int);
 extern int                      sock_no_sendmsg(struct kiocb *, struct socket *,
-                                               struct msghdr *, int);
+                                               struct msghdr *, size_t);
 extern int                      sock_no_recvmsg(struct kiocb *, struct socket *,
-                                               struct msghdr *, int, int);
+                                               struct msghdr *, size_t, int);
 extern int                     sock_no_mmap(struct file *file,
                                             struct socket *sock,
                                             struct vm_area_struct *vma);

diff --git a/net/core/sock.c b/net/core/sock.c
index d549d519482d4fa4a91560589f6ca9c09803ad56..27dfe373e59fab18f5b13ebff63a07e55c33e398 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -966,13 +966,13 @@ int sock_no_getsockopt(struct socket *sock, int level, int optname,
 }
 
 int sock_no_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
-                   int flags)
+                   size_t len)
 {
        return -EOPNOTSUPP;
 }
 
 int sock_no_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m,
-                   int len, int flags)
+                   size_t len, int flags)
 {
        return -EOPNOTSUPP;
 }

diff --git a/net/socket.c b/net/socket.c
index bafabac1f891e1a3278e9a3b6ea53b35298397ec..3503ca7a6c205fab9c4456fe7bb92c24a1caa1c1 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -523,7 +523,8 @@ void sock_release(struct socket *sock)
        sock->file=NULL;
 }
 
-static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, int size)
+static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
+                                struct msghdr *msg, size_t size)
 {
        struct sock_iocb *si = kiocb_to_siocb(iocb);
        int err;
@@ -540,7 +541,7 @@ static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct
        return sock->ops->sendmsg(iocb, sock, msg, size);
 }
 
-int sock_sendmsg(struct socket *sock, struct msghdr *msg, int size)
+int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
 {
        struct kiocb iocb;
        int ret;
@@ -553,7 +554,8 @@ int sock_sendmsg(struct socket *sock, struct msghdr *msg, int size)
 }
 
 
-static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, int size, int flags)
+static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, 
+                                struct msghdr *msg, size_t size, int flags)
 {
        int err;
        struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -571,7 +573,8 @@ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct
        return sock->ops->recvmsg(iocb, sock, msg, size, flags);
 }
 
-int sock_recvmsg(struct socket *sock, struct msghdr *msg, int size, int flags)
+int sock_recvmsg(struct socket *sock, struct msghdr *msg, 
+                size_t size, int flags)
 {
        struct kiocb iocb;
        int ret;
@@ -668,7 +671,7 @@ ssize_t sock_sendpage(struct file *file, struct page *page,
 }
 
 int sock_readv_writev(int type, struct inode * inode, struct file * file,
-                     const struct iovec * iov, long count, long size)
+                     const struct iovec * iov, long count, size_t size)
 {
        struct msghdr msg;
        struct socket *sock;