From patchwork Wed Oct 18 07:00:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 116214 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5743471qgn; Wed, 18 Oct 2017 00:02:50 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCXPzR3dRATSMUKVKuh+klCpuw9VGMtpAPj8cjWWZDZy73YsPjBs/ugFjU1WuaADLTei61B X-Received: by 10.101.81.198 with SMTP id i6mr12833571pgq.451.1508310170004; Wed, 18 Oct 2017 00:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508310169; cv=none; d=google.com; s=arc-20160816; b=x4K6E0L1DfqmALDIEdW5Cp8PusN2iXXZvCo+LDOAUlXUMJjcUPkajq5eoJr+vjog4C djq1ZaKtjkklLs/wmuZeY1xaTDKf0u1Rj8tgthuTf5+V8tpRk24t4yfWTAAjTP7cL6yg 8fbbY8VwYxH2iHSW+3j3m71sf2zsOdJDLXVzhB0NkCZAPM9O9SwOllvzEBsQOWOdqzWk CI2l/fw5VSqBP5G5NHAEZvrCSUX5dYGt2XV1mqA1F840hxey8a9y0TzvcaNCS7a8Pgep ZwdGrsCHNkHPfVqn8BFqHm8ppU9JimrBgB6UlLb3oMJRAgsQMI6Q1qC2y2HygeYsc94I 3T1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BIWQ2O8mY4CeK17p+aXfGTb8oWz17VDMK4hPtcHK/SM=; b=LWLOmjoV0kFWZOVo1MdzSa1uxEOMinUsZ//rQh2aqET/+121uwhAF2ijwNN8tAlivX bKEPWwad3T/xPgLsT+/6AwRtXY6wDNkgJbpZilaOO8J9+XZQaidLlVI6qyVeukrNv6z8 pFpSW3PBymsy3aUQ6/T+1sThfrTgkQBGaPeAcysImMYyhjNV7NAYUcyN5T0iAzZP1LRb uvvaBljqKG6Wd98L0b8SjUgml0VM4XaeK4x3+X7YJlK8iEYD2DKx8rjDm3E7C4er8ZHm 4x6Pht5w4ecP0SPhITa9M+aNRiYoBL1aERVmmPyo1mIYiZUMMQAsnD89EQaYdgyBt+gi zl5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b61si5969307plb.488.2017.10.18.00.02.49; Wed, 18 Oct 2017 00:02:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966521AbdJRHCr (ORCPT + 27 others); Wed, 18 Oct 2017 03:02:47 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:33336 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966495AbdJRHCn (ORCPT ); Wed, 18 Oct 2017 03:02:43 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 73DA4F; Wed, 18 Oct 2017 00:02:43 -0700 (PDT) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 22BFA3F590; Wed, 18 Oct 2017 00:02:34 -0700 (PDT) From: Gilad Ben-Yossef To: Herbert Xu , "David S. Miller" , Jonathan Corbet , David Howells , Tom Lendacky , Gary Hook , Boris Brezillon , Arnaud Ebalard , Matthias Brugger , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, Steve French , "Theodore Y. Ts'o" , Jaegeuk Kim , Steffen Klassert , Alexey Kuznetsov , Hideaki YOSHIFUJI , Mimi Zohar , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" Cc: Ofir Drang , linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, keyrings@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-fscrypt@vger.kernel.org, netdev@vger.kernel.org, linux-ima-devel@lists.sourceforge.net, linux-ima-user@lists.sourceforge.net, linux-security-module@vger.kernel.org Subject: [PATCH v10 03/20] net: use -ENOSPC for transient busy indication Date: Wed, 18 Oct 2017 08:00:35 +0100 Message-Id: <1508310057-25369-4-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508310057-25369-1-git-send-email-gilad@benyossef.com> References: <1508310057-25369-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace -EBUSY with -ENOSPC when handling transient busy indication in the absence of backlog. Signed-off-by: Gilad Ben-Yossef --- Please squash this patch with the previous one when merging upstream. net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv6/ah6.c | 2 +- net/ipv6/esp6.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index 37db44f..4dd95cd 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c @@ -240,7 +240,7 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb) if (err == -EINPROGRESS) goto out; - if (err == -EBUSY) + if (err == -ENOSPC) err = NET_XMIT_DROP; goto out_free; } diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index b00e4a4..d57aa64 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -432,7 +432,7 @@ int esp_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info * case -EINPROGRESS: goto error; - case -EBUSY: + case -ENOSPC: err = NET_XMIT_DROP; break; diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index 7802b72..3bd9d80 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -443,7 +443,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) if (err == -EINPROGRESS) goto out; - if (err == -EBUSY) + if (err == -ENOSPC) err = NET_XMIT_DROP; goto out_free; } diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 89910e2..c04d995 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -396,7 +396,7 @@ int esp6_output_tail(struct xfrm_state *x, struct sk_buff *skb, struct esp_info case -EINPROGRESS: goto error; - case -EBUSY: + case -ENOSPC: err = NET_XMIT_DROP; break;