From patchwork Thu Jul 3 04:12:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4469181 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB81CBEEAA for ; Thu, 3 Jul 2014 04:13:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D612220381 for ; Thu, 3 Jul 2014 04:13:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0192203A1 for ; Thu, 3 Jul 2014 04:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750743AbaGCENC (ORCPT ); Thu, 3 Jul 2014 00:13:02 -0400 Received: from mail-yk0-f174.google.com ([209.85.160.174]:57789 "EHLO mail-yk0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707AbaGCENA (ORCPT ); Thu, 3 Jul 2014 00:13:00 -0400 Received: by mail-yk0-f174.google.com with SMTP id 19so6958138ykq.33 for ; Wed, 02 Jul 2014 21:12:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Uh7QxHlaHrsVJKlWGYokOMb7sAXK1iz2gasX3ZxFQbA=; b=H9sE7Sjfryjm/MN/i3loh3TR+x1xiRxVWSZyA3MV2LnGRadLrMz2l+hqJt3msmCRjT z8VqRmVTCp56obO3elH/2oE9oaS+9Sipkj6CtC6RgaQfKxtzPYTG+57CV9QNH/m7QUUQ 1j6Ig73Lw+JH/UjDns/WcmBdG2hl6z/BmK6WvxOmdOmhz7912OzizHKfuzWm3jBXqSW7 ziRcX8p34813bIcwnKWI+JfuSjFThM54PCUHKmNJsigThF1X2BU38esTzL6bieqBMCn2 AGMJaLa2bP3pM8XPRVqe4XrQ8t0SZfAWbB3B4rda04OHN/1wyZB6jujM1J2gotyU3qic fFcw== X-Gm-Message-State: ALoCoQn92FajAHAdlXR2jr2N8JX5ALfRXovBAi3UY7i8ynITwwMgoAil6dNUWQ9q7U7xeDSW87kZ X-Received: by 10.236.150.70 with SMTP id y46mr3326512yhj.52.1404360779308; Wed, 02 Jul 2014 21:12:59 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-33-230-70.drr02.mskg.mi.frontiernet.net. [50.33.230.70]) by mx.google.com with ESMTPSA id d43sm772617yhc.27.2014.07.02.21.12.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jul 2014 21:12:58 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 2/2] SUNRPC: Handle EPIPE in xprt_connect_status Date: Thu, 3 Jul 2014 00:12:51 -0400 Message-Id: <1404360771-6782-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404360771-6782-1-git-send-email-trond.myklebust@primarydata.com> References: <1404360771-6782-1-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The callback handler xs_error_report() can end up propagating an EPIPE error by means of the call to xprt_wake_pending_tasks(). Ensure that xprt_connect_status() does not automatically convert this into an EIO error. Reported-by: Weston Andros Adamson Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 1 + net/sunrpc/xprt.c | 1 + 2 files changed, 2 insertions(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 575e63f6c13e..488ddeed9363 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1814,6 +1814,7 @@ call_connect_status(struct rpc_task *task) case -ENETUNREACH: case -EHOSTUNREACH: case -ENOBUFS: + case -EPIPE: if (RPC_IS_SOFTCONN(task)) break; /* retry with existing socket, after a delay */ diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index c3b2b3369e52..c5b2916298b0 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -744,6 +744,7 @@ static void xprt_connect_status(struct rpc_task *task) case -ECONNABORTED: case -ENETUNREACH: case -EHOSTUNREACH: + case -EPIPE: case -EAGAIN: dprintk("RPC: %5u xprt_connect_status: retrying\n", task->tk_pid); break;