From patchwork Mon Sep 17 13:03:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10602683 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C51A17E1 for ; Mon, 17 Sep 2018 13:04:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F19AA299C8 for ; Mon, 17 Sep 2018 13:04:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E68C529B63; Mon, 17 Sep 2018 13:04:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9717299C8 for ; Mon, 17 Sep 2018 13:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728187AbeIQSbd (ORCPT ); Mon, 17 Sep 2018 14:31:33 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:40181 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728229AbeIQSbd (ORCPT ); Mon, 17 Sep 2018 14:31:33 -0400 Received: by mail-qk1-f196.google.com with SMTP id c126-v6so8903753qkd.7 for ; Mon, 17 Sep 2018 06:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=z5HXZWCWUzLdUlbdjKtg2GNpHHsSy8t35huOZeBZd/M=; b=ZHE29OPi5gdLr1Tl4mdZ4qes1o0bBIF95+7dojYx1zH+e8wtvkK6o3hyQWxFDdBAvU 08K2O7hbrlxa4Ul4/gzO4SxszA7oxHvZCU1xxpk7x428HED307OLSbWWUiiQJ0Gefk0r n+Wz66/D7VPhI75HwkzIx1bWI3QDTTw12kHkywFvnHl/3pPT3dpFETgxmkoAZCsUci46 FoXl+Ojp1wKzF5z6HOnyhXb3DaGl6Mh6YSbxExbwvC654/xtR2hS0Aa/Food5RUveGNk kZgtV1uDKr4x2hC71iUl4er3kNM5PYzJqisUO3VgMLSuwAZyXACQMSEOaGr1ufd1nSid Chhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z5HXZWCWUzLdUlbdjKtg2GNpHHsSy8t35huOZeBZd/M=; b=MW4KvcfwDTsxZamjt0TlHu7irKGHrn4uPUvyJ1LgWEVOLMRUZFMaBBOf1ZqZS0nCmy 4BNXeH4VlAfRp54+J7M7l3Zaf3nW7yPRkp6Q+qOWIZSC5S/EgkuX/9tRvFX+g8ynSG2f XFs07a93MGlNUB3J/ZOW319uEjGjOLNyn6v5U0l4QD8XiN/UkhHTEZK/O9ggKc3+Jt27 stxVP8Qb0KojsrULXF3DB9aqRNtBjgQ3j/AmO2VQGXrwtMp5K97L9mmGv/gprk9yZaCu cw7JiqMoHzdqMb026JI77OTIuHxVGldlN0IiO4UvLVezvFctA9aAlW9ZjfyvX5hPG9wY FRoQ== X-Gm-Message-State: APzg51D85pqCtVjOPf2HeSwp+B7e4yj0e6fhtNasF2cMmLd2ge4RaAeE 7m2Oq3w+M0ZEDbGK3+iIoPbgObrZgA== X-Google-Smtp-Source: ANB0VdbrbCE+VzeQom0T4hy7h3niuP99Gj9XIXo/TcBqIIP4zPg4BTL05RUQXLmBR+BM/atUntpCCQ== X-Received: by 2002:a37:b546:: with SMTP id e67-v6mr17232976qkf.237.1537189457349; Mon, 17 Sep 2018 06:04:17 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([66.187.232.65]) by smtp.gmail.com with ESMTPSA id q1-v6sm10499607qkl.31.2018.09.17.06.04.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Sep 2018 06:04:16 -0700 (PDT) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 17/44] SUNRPC: Minor cleanup for call_transmit() Date: Mon, 17 Sep 2018 09:03:08 -0400 Message-Id: <20180917130335.112832-18-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180917130335.112832-17-trond.myklebust@hammerspace.com> References: <20180917130335.112832-1-trond.myklebust@hammerspace.com> <20180917130335.112832-2-trond.myklebust@hammerspace.com> <20180917130335.112832-3-trond.myklebust@hammerspace.com> <20180917130335.112832-4-trond.myklebust@hammerspace.com> <20180917130335.112832-5-trond.myklebust@hammerspace.com> <20180917130335.112832-6-trond.myklebust@hammerspace.com> <20180917130335.112832-7-trond.myklebust@hammerspace.com> <20180917130335.112832-8-trond.myklebust@hammerspace.com> <20180917130335.112832-9-trond.myklebust@hammerspace.com> <20180917130335.112832-10-trond.myklebust@hammerspace.com> <20180917130335.112832-11-trond.myklebust@hammerspace.com> <20180917130335.112832-12-trond.myklebust@hammerspace.com> <20180917130335.112832-13-trond.myklebust@hammerspace.com> <20180917130335.112832-14-trond.myklebust@hammerspace.com> <20180917130335.112832-15-trond.myklebust@hammerspace.com> <20180917130335.112832-16-trond.myklebust@hammerspace.com> <20180917130335.112832-17-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 775d6e80b6e8..be0f06a8156b 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1946,9 +1946,7 @@ call_transmit(struct rpc_task *task) dprint_status(task); - task->tk_action = call_status; - if (task->tk_status < 0) - return; + task->tk_action = call_transmit_status; /* Encode here so that rpcsec_gss can use correct sequence number. */ if (rpc_task_need_encode(task)) { rpc_xdr_encode(task); @@ -1969,7 +1967,6 @@ call_transmit(struct rpc_task *task) if (!xprt_prepare_transmit(task)) return; - task->tk_action = call_transmit_status; xprt_transmit(task); if (task->tk_status < 0) return; @@ -1996,19 +1993,29 @@ call_transmit_status(struct rpc_task *task) } switch (task->tk_status) { - case -EAGAIN: - case -ENOBUFS: - break; default: dprint_status(task); xprt_end_transmit(task); break; + case -EBADMSG: + clear_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate); + task->tk_action = call_transmit; + task->tk_status = 0; + xprt_end_transmit(task); + break; /* * Special cases: if we've been waiting on the * socket's write_space() callback, or if the * socket just returned a connection error, * then hold onto the transport lock. */ + case -ENOBUFS: + rpc_delay(task, HZ>>2); + /* fall through */ + case -EAGAIN: + task->tk_action = call_transmit; + task->tk_status = 0; + break; case -ECONNREFUSED: case -EHOSTDOWN: case -ENETDOWN: @@ -2163,22 +2170,13 @@ call_status(struct rpc_task *task) /* fall through */ case -EPIPE: case -ENOTCONN: - task->tk_action = call_bind; - break; - case -ENOBUFS: - rpc_delay(task, HZ>>2); - /* fall through */ case -EAGAIN: - task->tk_action = call_transmit; + task->tk_action = call_bind; break; case -EIO: /* shutdown or soft timeout */ rpc_exit(task, status); break; - case -EBADMSG: - clear_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate); - task->tk_action = call_transmit; - break; default: if (clnt->cl_chatty) printk("%s: RPC call returned error %d\n",