From patchwork Sat Feb 28 14:44:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 23892 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.176.167]) by ozlabs.org (Postfix) with ESMTP id C0283DDDA1 for ; Sun, 1 Mar 2009 01:45:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753921AbZB1OpX (ORCPT ); Sat, 28 Feb 2009 09:45:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752749AbZB1OpV (ORCPT ); Sat, 28 Feb 2009 09:45:21 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:58368 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752583AbZB1Ooz (ORCPT ); Sat, 28 Feb 2009 09:44:55 -0500 Received: from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi [128.214.166.179]) (AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.cs.helsinki.fi with esmtp; Sat, 28 Feb 2009 16:44:43 +0200 id 0008C1FB.49A94DDB.00003AFE Received: by wrl-59.cs.helsinki.fi (Postfix, from userid 50795) id 7DF9916B141; Sat, 28 Feb 2009 16:44:43 +0200 (EET) From: "=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=" To: David Miller Cc: netdev@vger.kernel.org, "=?utf-8?q?Ilpo=20J=C3=A4rvinen?=" Subject: [PATCH net-next 16/17] tcp: in sendmsg/pages open code the real goto target Date: Sat, 28 Feb 2009 16:44:41 +0200 Message-Id: <12358322833023-git-send-email-ilpo.jarvinen@helsinki.fi> X-Mailer: git-send-email 1.5.2.2 In-Reply-To: <12358322831223-git-send-email-ilpo.jarvinen@helsinki.fi> References: <12358322821815-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322821434-git-send-email-ilpo.jarvinen@helsinki.fi> <1235832282317-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322823783-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322821182-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322832831-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831953-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831147-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322833102-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322832711-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322834113-git-send-email-ilpo.jarvinen@helsinki.fi> <1235832283214-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831599-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322832879-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831019-git-send-email-ilpo.jarvinen@helsinki.fi> <12358322831223-git-send-email-ilpo.jarvinen@helsinki.fi> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ilpo Järvinen copied was assigned zero right before the goto, so if (copied) cannot ever be true. Signed-off-by: Ilpo Järvinen --- net/ipv4/tcp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 90b2f3c..d3f9bee 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -683,7 +683,7 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse err = -EPIPE; if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) - goto do_error; + goto out_err; while (psize > 0) { struct sk_buff *skb = tcp_write_queue_tail(sk); @@ -854,7 +854,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, err = -EPIPE; if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) - goto do_error; + goto out_err; while (--iovlen >= 0) { int seglen = iov->iov_len;