From patchwork Thu Jan 15 09:35:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 429318 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 322221401AF for ; Thu, 15 Jan 2015 20:36:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522AbbAOJgF (ORCPT ); Thu, 15 Jan 2015 04:36:05 -0500 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:48831 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbbAOJgE (ORCPT ); Thu, 15 Jan 2015 04:36:04 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id BE7BD2826F; Thu, 15 Jan 2015 10:36:01 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1YBgqP-00017k-Eg; Thu, 15 Jan 2015 10:36:01 +0100 From: Nicolas Dichtel To: netdev@vger.kernel.org Cc: davem@davemloft.net, Nicolas Dichtel Subject: [PATCH net-next v2] socket: use iov_length() Date: Thu, 15 Jan 2015 10:35:58 +0100 Message-Id: <1421314558-4252-1-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <20150114.164528.230093054757243054.davem@davemloft.net> References: <20150114.164528.230093054757243054.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Better to use available helpers. Signed-off-by: Nicolas Dichtel --- v2: initialize size variable with iov_length() result net/socket.c | 12 ++---------- 1 file 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, unsigned long nr_segs) { struct socket *sock = file->private_data; - size_t size = 0; - int i; - - for (i = 0; i < nr_segs; i++) - size += iov[i].iov_len; + size_t size = iov_length(iov, nr_segs); msg->msg_name = NULL; msg->msg_namelen = 0; @@ -921,11 +917,7 @@ static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb, unsigned long nr_segs) { struct socket *sock = file->private_data; - size_t size = 0; - int i; - - for (i = 0; i < nr_segs; i++) - size += iov[i].iov_len; + size_t size = iov_length(iov, nr_segs); msg->msg_name = NULL; msg->msg_namelen = 0;