summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-01-15 04:35:58 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-15 13:56:15 -0500
commit7eb35b148305c6f86a6bc5818c29f79e0d45146c (patch)
treebb196b77d758c25556f58565ad663f2c8568ca3e /net/socket.c
parent4e7a84b1a5bc8094522fd11f628b00c4b4e78b4d (diff)
socket: use iov_length()
Better to use available helpers. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/net/socket.c b/net/socket.c
index a2c33a4dc7ba..e1278d7e1d5d 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -882,11 +882,7 @@ static ssize_t do_sock_read(struct msghdr *msg, struct kiocb *iocb,
882 unsigned long nr_segs) 882 unsigned long nr_segs)
883{ 883{
884 struct socket *sock = file->private_data; 884 struct socket *sock = file->private_data;
885 size_t size = 0; 885 size_t size = iov_length(iov, nr_segs);
886 int i;
887
888 for (i = 0; i < nr_segs; i++)
889 size += iov[i].iov_len;
890 886
891 msg->msg_name = NULL; 887 msg->msg_name = NULL;
892 msg->msg_namelen = 0; 888 msg->msg_namelen = 0;
@@ -921,11 +917,7 @@ static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb,
921 unsigned long nr_segs) 917 unsigned long nr_segs)
922{ 918{
923 struct socket *sock = file->private_data; 919 struct socket *sock = file->private_data;
924 size_t size = 0; 920 size_t size = iov_length(iov, nr_segs);
925 int i;
926
927 for (i = 0; i < nr_segs; i++)
928 size += iov[i].iov_len;
929 921
930 msg->msg_name = NULL; 922 msg->msg_name = NULL;
931 msg->msg_namelen = 0; 923 msg->msg_namelen = 0;