From patchwork Tue Mar 5 15:17:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10839571 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 28839139A for ; Tue, 5 Mar 2019 15:18:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 155052C6A3 for ; Tue, 5 Mar 2019 15:18:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 076032C6A6; Tue, 5 Mar 2019 15:18:34 +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 A467E2C6A3 for ; Tue, 5 Mar 2019 15:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728439AbfCEPSd (ORCPT ); Tue, 5 Mar 2019 10:18:33 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:38367 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbfCEPSc (ORCPT ); Tue, 5 Mar 2019 10:18:32 -0500 Received: by mail-io1-f66.google.com with SMTP id p18so7322950ioh.5 for ; Tue, 05 Mar 2019 07:18:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=nZRhqCSGAmuqPoKC3r6VvDIcMWODu7nvIwDgDx3PHGU=; b=N86omJ3KMoC5tP6ofBJwI0pe5WxFD8doUTQhVYZ6tNoAZNDeFrUEXcaEoKHUiUYIBJ NTOuvuYXIQ/HQ/9j+POF9/yOvYKwqgNSuMxGlWAtOv7ZhzwbGOPM9krXakFIUngS6yEO tgJ4OYkgzworGL0Ygj2e9Gro/pT75uoqaW3C1+DlPGYHZaGc4uIhNbXmHayngM32LUJB N0qKeoB7gwL6FpetW9Fj0Hmp2qgAhVWasOg9fUQ6GTUIkii6yfq0V0LSn95P8m2urgkB ryXyL47WJApDQFNv6oYwpgGoRGkaHbROXZck2gl3qxcsbPrLjtni+Si8kUN4yQX1potr pVOQ== 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:mime-version :content-transfer-encoding; bh=nZRhqCSGAmuqPoKC3r6VvDIcMWODu7nvIwDgDx3PHGU=; b=Fy4kd7VNNMWQce5ey8N4z2RsoJwsAdlywqKNqsEy8lwHQVH/8IBigmRLH7Us+eaaB9 KZdGwGiu5epYFPmtssBfbx8a7eR7kUE8vaj5B6M+6DfALiCHGbe9XkKrR1hYWsjp/1AE yTdI26t4ySu5pPBMkJ0DtKpOLaaswJZ4fyzLsNC8eUedjXQGdc7pSiqTy5OS5X/AW2zX 9hCs/LkfTglcLHvxkC+yJk/trf9B8m+QNpW5t9w6WvXk6H5kyFK/6tBm5kxadKdjlwU/ tmdDoJgQ0hjPUpvmCXDiN21DlipsiAo4h5h+LkMCHWNbMpUVXBoSoVOZw4mxaMSxfPTc T9mw== X-Gm-Message-State: APjAAAVuGRo5IVIES3RCaZhgUngjFwKDiAl/1Kn+7I8/e1eLCbz7/w27 wbAIDMLkFOk3SMxtEGgNonf4SyU= X-Google-Smtp-Source: APXvYqxDi2QIYzIqY3P+leMUTDIyOXXxswbvgwaV3LVc8WIK3+yrCiKSYnCWMcB2iPBMR//vVTi/og== X-Received: by 2002:a5d:97c8:: with SMTP id k8mr304348ios.267.1551799111405; Tue, 05 Mar 2019 07:18:31 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id 10sm5003935itv.10.2019.03.05.07.18.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Mar 2019 07:18:30 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/3] SUNRPC: Prevent thundering herd when the socket is not connected Date: Tue, 5 Mar 2019 10:17:20 -0500 Message-Id: <20190305151722.45732-1-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 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 If the socket is not connected, then we want to initiate a reconnect rather that trying to transmit requests. If there is a large number of requests queued and waiting for the lock in call_transmit(), then it can take a while for one of the to loop back and retake the lock in call_connect. Fixes: 89f90fe1ad8b ("SUNRPC: Allow calls to xprt_transmit() to drain...") Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 241e8423fd0c..e7ae75a045c9 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2003,6 +2003,12 @@ call_transmit(struct rpc_task *task) if (test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) { if (!xprt_prepare_transmit(task)) return; + /* Check that the connection is OK */ + if (!xprt_connected(task->tk_xprt) || + !xprt_bound(task->tk_xprt)) { + task->tk_action = call_bind; + return; + } xprt_transmit(task); } task->tk_action = call_transmit_status; From patchwork Tue Mar 5 15:17:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10839575 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 C69981390 for ; Tue, 5 Mar 2019 15:18:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3F7D2C6A3 for ; Tue, 5 Mar 2019 15:18:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A899E2C6A6; Tue, 5 Mar 2019 15:18:35 +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 3415F2C6A3 for ; Tue, 5 Mar 2019 15:18:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728481AbfCEPSe (ORCPT ); Tue, 5 Mar 2019 10:18:34 -0500 Received: from mail-it1-f193.google.com ([209.85.166.193]:40943 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727114AbfCEPSe (ORCPT ); Tue, 5 Mar 2019 10:18:34 -0500 Received: by mail-it1-f193.google.com with SMTP id l139so4978050ita.5 for ; Tue, 05 Mar 2019 07:18:33 -0800 (PST) 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=BYsqryolyjzRCd67B0Kt2dHBgB8sofnU9RITB2T3s2w=; b=V/Z3Nbx4kjjwTpuJ1T6FDO7b8oAv8c3KWQRtMq7ejmgvpKR8hBH04GBOIuXH2NmADN aExngd7qAh/fxmvhJwb76BPFKM3dg49QsxfWRi4iMdSpAhEJBH/IZFQQQs3LC3EadxyV vlUFL1NGPMHf7oKL9yGUL7/mf20+UMdh6U6ksudAMJjOpi6oVyDZA9TtXcRmHG5mvfP8 ZzAGv1eaVgi6xhl5KcT9gqBuJQA7BzOr/IrX3ujRkJPQ+IHY93eOmWoJQI6aQRierTG2 GLE06YFnoiQ9dkPDfROulf4wscBYVCx9+Pz6t55oS5eCk/hw50tck/P6+5AP7MkXMHdZ 5EeA== 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=BYsqryolyjzRCd67B0Kt2dHBgB8sofnU9RITB2T3s2w=; b=pnxMeeaNySNzs2F4syW34Py9olbhkZJTf1V/jSnAqTuTbEDUozLlgGT8my3CIFTug2 dyWjShtalx50JiQpoENLQ122SIqTjMVQ0c5JxE17XRw376Kg5lE5ZLGVJpzsFSA2B4Dh oHOnyzbZFPuy/FismCcPUr2SkJSgUSlFTNcN9kHF3OMH5hzXX/MnMHD45eSp0hwcm3w9 8tV2EQ3Yd7lZWUaJoK5P3jULOrC7BJNg8IUB4urG8q28UFpWY5XKBPufn5qCDvLjqjSo RtUHLvgAYFTWKkYSR8lzt5I1xWwlx3jCnj6OWfxAZQEsGooZ/M2inFDnyjG4PMewYGk5 J8Ag== X-Gm-Message-State: APjAAAUQOzEH1KL+o8VGpZ/rZbE65f3Bt9qYYWhv4nJ+rdSTQyJ8V2cl 26qtoiR9niRNa1WcQaUuLF+RJGg= X-Google-Smtp-Source: APXvYqzTXwID//FLg0bZDgmS0+Oaq1xkRQfuBlJ450Vq/hDfq8kKcloIrxcpmVPvXOvyELsYQN+qiQ== X-Received: by 2002:a24:c486:: with SMTP id v128mr3014089itf.138.1551799112166; Tue, 05 Mar 2019 07:18:32 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id 10sm5003935itv.10.2019.03.05.07.18.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Mar 2019 07:18:31 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/3] SUNRPC: Fix up RPC back channel transmission Date: Tue, 5 Mar 2019 10:17:21 -0500 Message-Id: <20190305151722.45732-2-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305151722.45732-1-trond.myklebust@hammerspace.com> References: <20190305151722.45732-1-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 Now that transmissions happen through a queue, we require the RPC tasks to handle error conditions that may have been set while they were sleeping. The back channel does not currently do this, but assumes that any error condition happens during its own call to xprt_transmit(). The solution is to ensure that the back channel splits out the error handling just like the forward channel does. Fixes: 89f90fe1ad8b ("SUNRPC: Allow calls to xprt_transmit() to drain...") Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 64 +++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index e7ae75a045c9..c154684a35d4 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -66,9 +66,6 @@ static void call_decode(struct rpc_task *task); static void call_bind(struct rpc_task *task); static void call_bind_status(struct rpc_task *task); static void call_transmit(struct rpc_task *task); -#if defined(CONFIG_SUNRPC_BACKCHANNEL) -static void call_bc_transmit(struct rpc_task *task); -#endif /* CONFIG_SUNRPC_BACKCHANNEL */ static void call_status(struct rpc_task *task); static void call_transmit_status(struct rpc_task *task); static void call_refresh(struct rpc_task *task); @@ -1133,6 +1130,8 @@ rpc_call_async(struct rpc_clnt *clnt, const struct rpc_message *msg, int flags, EXPORT_SYMBOL_GPL(rpc_call_async); #if defined(CONFIG_SUNRPC_BACKCHANNEL) +static void call_bc_encode(struct rpc_task *task); + /** * rpc_run_bc_task - Allocate a new RPC task for backchannel use, then run * rpc_execute against it @@ -1154,7 +1153,7 @@ struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req) task = rpc_new_task(&task_setup_data); xprt_init_bc_request(req, task); - task->tk_action = call_bc_transmit; + task->tk_action = call_bc_encode; atomic_inc(&task->tk_count); WARN_ON_ONCE(atomic_read(&task->tk_count) != 2); rpc_execute(task); @@ -2078,6 +2077,16 @@ call_transmit_status(struct rpc_task *task) } #if defined(CONFIG_SUNRPC_BACKCHANNEL) +static void call_bc_transmit(struct rpc_task *task); +static void call_bc_transmit_status(struct rpc_task *task); + +static void +call_bc_encode(struct rpc_task *task) +{ + xprt_request_enqueue_transmit(task); + task->tk_action = call_bc_transmit; +} + /* * 5b. Send the backchannel RPC reply. On error, drop the reply. In * addition, disconnect on connectivity errors. @@ -2085,26 +2094,29 @@ call_transmit_status(struct rpc_task *task) static void call_bc_transmit(struct rpc_task *task) { - struct rpc_rqst *req = task->tk_rqstp; - - if (rpc_task_need_encode(task)) - xprt_request_enqueue_transmit(task); - if (!test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) - goto out_wakeup; - - if (!xprt_prepare_transmit(task)) - goto out_retry; + task->tk_status = 0; - if (task->tk_status < 0) { - printk(KERN_NOTICE "RPC: Could not send backchannel reply " - "error: %d\n", task->tk_status); - goto out_done; + if (test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) { + if (!xprt_prepare_transmit(task)) + return; + if (!xprt_connected(task->tk_xprt) || + !xprt_bound(task->tk_xprt)) { + rpc_exit(task, -ENOTCONN); + return; + } + xprt_transmit(task); } + task->tk_action = call_bc_transmit_status; + xprt_end_transmit(task); +} - xprt_transmit(task); +static void +call_bc_transmit_status(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; - xprt_end_transmit(task); dprint_status(task); + switch (task->tk_status) { case 0: /* Success */ @@ -2118,8 +2130,13 @@ call_bc_transmit(struct rpc_task *task) case -ENOTCONN: case -EPIPE: break; + case -ENOBUFS: + rpc_delay(task, HZ>>2); + /* fall through */ + case -EBADSLT: case -EAGAIN: - goto out_retry; + task->tk_action = call_bc_transmit; + return; case -ETIMEDOUT: /* * Problem reaching the server. Disconnect and let the @@ -2138,18 +2155,11 @@ call_bc_transmit(struct rpc_task *task) * We were unable to reply and will have to drop the * request. The server should reconnect and retransmit. */ - WARN_ON_ONCE(task->tk_status == -EAGAIN); printk(KERN_NOTICE "RPC: Could not send backchannel reply " "error: %d\n", task->tk_status); break; } -out_wakeup: - rpc_wake_up_queued_task(&req->rq_xprt->pending, task); -out_done: task->tk_action = rpc_exit_task; - return; -out_retry: - task->tk_status = 0; } #endif /* CONFIG_SUNRPC_BACKCHANNEL */ From patchwork Tue Mar 5 15:17:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 10839573 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 24365139A for ; Tue, 5 Mar 2019 15:18:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13A112C6A3 for ; Tue, 5 Mar 2019 15:18:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 07FAE2C6A6; Tue, 5 Mar 2019 15:18:35 +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 B6B2A2C6A3 for ; Tue, 5 Mar 2019 15:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728691AbfCEPSe (ORCPT ); Tue, 5 Mar 2019 10:18:34 -0500 Received: from mail-it1-f193.google.com ([209.85.166.193]:38782 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728481AbfCEPSe (ORCPT ); Tue, 5 Mar 2019 10:18:34 -0500 Received: by mail-it1-f193.google.com with SMTP id l66so4993259itg.3 for ; Tue, 05 Mar 2019 07:18:33 -0800 (PST) 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=cyoz9B+wDTlz4x0rCUfVddKoJ4TERhnTLbYg5vabN+Q=; b=jZhPdV2R5GsXHyRvdvITrPQHt6sIY4WTg3m/Um5lrVrlOumnJr3Ja8RbBqjuiw8M06 Q4iePgrzWUNmOW4iytcVQeS9So2AcHdi4O9ZauEpHkwVUDU1ycgDOLhjW1mVqMckmazI fiROJIZeLOKMhRE8pylHQh3dnwO4ajAyzeFxgQCzSV65HHVLTGtAXsE02cwGEgXH/XLM ssxv6LNXxHx+qHCGbjSxo5tznk66/V7FSSmhgcnJI231oDH3gv7Ki3fcorBanBgUlWCK RPvSnBS2eQ5/zb8EAcp5vO3+HZYevbKg8PmhWLndDOoImw5ox0lMIWc2P9Bi+gd5Gbh0 Zu+Q== 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=cyoz9B+wDTlz4x0rCUfVddKoJ4TERhnTLbYg5vabN+Q=; b=OEDpRu9OgnJUi8BRTtnaZGN3kvHKnjR9B7qPB6FKtw1w9bWqr/1W9rH3ovulRtUAbJ oAuX0gId+wH8+aFsU+PXDQZJyND48R++tuMUB0MwqLQ80N7XqhZsAfWrSS2waW5gS2lT GR8aM5uJgd9wTvdE48RoYEOTK/HM+15mm3ziuJoVUOTNkakIP4bf3adWebFoGxx8vcok OjJqZzx5t+w0fk19bywjWDVAnbXP70/k5zoVu2EDipD7xksVNZgap4TM6qHTJtUkRdgK Iz8Lhl2w0tGJfiluRMUrtTYhwm9Grvi45EDQtKgAHKGrHP/YPvUIqJeLPjV0FgGRk5lG f5PQ== X-Gm-Message-State: APjAAAVo0207AIvIRqAsmS4+QvC/EVXV+PXfC7uHfwpuzkn5v95cVt09 uH6m0nMkgrEP5SfAO/E/ztXP/zE= X-Google-Smtp-Source: APXvYqwQGzxl6mClIkZHn+RfgFRTz+uwD8oO97qtosuhtJLv9FUObTnyiqwFZFdkK4Vf1HUBEnpJvg== X-Received: by 2002:a24:7688:: with SMTP id z130mr2683290itb.94.1551799112914; Tue, 05 Mar 2019 07:18:32 -0800 (PST) Received: from localhost.localdomain (c-68-40-189-247.hsd1.mi.comcast.net. [68.40.189.247]) by smtp.gmail.com with ESMTPSA id 10sm5003935itv.10.2019.03.05.07.18.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Mar 2019 07:18:32 -0800 (PST) From: Trond Myklebust X-Google-Original-From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v2 3/3] SUNRPC: Micro-optimisation to avoid call_bind+call_commit Date: Tue, 5 Mar 2019 10:17:22 -0500 Message-Id: <20190305151722.45732-3-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190305151722.45732-2-trond.myklebust@hammerspace.com> References: <20190305151722.45732-1-trond.myklebust@hammerspace.com> <20190305151722.45732-2-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 Most tasks should not have to deal with disconnected or unbound socket states, so let's move them out of the common state machine path. Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index c154684a35d4..b9251fd696ee 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -1806,7 +1806,7 @@ call_encode(struct rpc_task *task) xprt_request_enqueue_receive(task); xprt_request_enqueue_transmit(task); out: - task->tk_action = call_bind; + task->tk_action = call_transmit; } /*