Message ID | 20180903152936.24325-23-trond.myklebust@hammerspace.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-nfs-owner@kernel.org> 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 483AC17DE for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 3 Sep 2018 15:30:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38656294FC for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 3 Sep 2018 15:30:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CFB72962F; Mon, 3 Sep 2018 15:30:22 +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 D3CE829632 for <patchwork-linux-nfs@patchwork.kernel.org>; Mon, 3 Sep 2018 15:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727430AbeICTvA (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Mon, 3 Sep 2018 15:51:00 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:36490 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727434AbeICTvA (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Mon, 3 Sep 2018 15:51:00 -0400 Received: by mail-it0-f67.google.com with SMTP id u13-v6so1481816iti.1 for <linux-nfs@vger.kernel.org>; Mon, 03 Sep 2018 08:30:20 -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=33bz9Q1DUi1pH988HaWfpQQhyV6dk5FgdW4xFTFGZ2s=; b=Uv8m7NfOid53zu1Zq9Hyj5+Tbx4PC92369/KSfMUL/RKzbrOB0LCNRHR+wGtVGLPvG 4k+KEXz3XeXfVxLEK7fxawRCB+8vtZ2QadchVhCtzzjHAVimTGGfHQLb+yO1e9ynRHR5 5cHhr9gcy6q0DF+im9iN684XzLYk19xW7tmmSBZq012T+EdAFDvatMz/L6v405o8T05x TiMGelWUwqTV4z9nRL1l/QHTXIfK6F/w2aESu64+OgnNvXfA3eufqM15N3yFrriWO2ob 8ziX+m3u4Z298Jc+K8zkycaGxDmrGd8nURFyYMlH1w7ZiB9McY/JqZg0nWKsVwZB7gRx 2IEQ== 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=33bz9Q1DUi1pH988HaWfpQQhyV6dk5FgdW4xFTFGZ2s=; b=ghurK3HhaDJm0mP8m3Lnl5auw0KAtlqL9jyOCA/4xP+CSVbEQhNjcVnPexslj9MbiF FV6C1vRcIF9mf9HTXgZDbrwZXxXP0tE89h0tTH+hxJYM4bjW+wLJdSEo48BE5pqW9IE2 ciSoE91mrZ406mQCknMp7xL+DbJNBgtN7SiYJnGelP8bLuZ93dbLYwWb9O2T5CbGoErb 39X03uKgqeUc/Wovchav10l24cvMsJwP/Yy/FI1yfOW96Ib/rIhcTlLoh1pCvA1zHEg4 ojBCvJu/h4stiZh0WeELMcTJT3o4sfJMpC++f24ub0hTw2/uPEqdeKNPCzbpyiPDeMho +jMQ== X-Gm-Message-State: APzg51AyYZb273J0YHNSY7T5wehU4ZLK9qanrOAnfILFqdrz5fX1q3Pk cQewBmtT3Nv1ze3eZvXrI82rZ5I= X-Google-Smtp-Source: ANB0Vdagn3RtShUaPLIPcGSTQ9zkPOgLpNuAO1UTE8AQpBiYY/LaErzzEjUaNoDxh0CK8g/cw53v3A== X-Received: by 2002:a24:6fd3:: with SMTP id x202-v6mr5271605itb.71.1535988619900; Mon, 03 Sep 2018 08:30:19 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-40-195-73.hsd1.mi.comcast.net. [68.40.195.73]) by smtp.gmail.com with ESMTPSA id c25-v6sm7040027iob.30.2018.09.03.08.30.19 for <linux-nfs@vger.kernel.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Sep 2018 08:30:19 -0700 (PDT) From: Trond Myklebust <trondmy@gmail.com> X-Google-Original-From: Trond Myklebust <trond.myklebust@hammerspace.com> To: linux-nfs@vger.kernel.org Subject: [PATCH 22/27] SUNRPC: Simplify xprt_prepare_transmit() Date: Mon, 3 Sep 2018 11:29:31 -0400 Message-Id: <20180903152936.24325-23-trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180903152936.24325-22-trond.myklebust@hammerspace.com> References: <20180903152936.24325-1-trond.myklebust@hammerspace.com> <20180903152936.24325-2-trond.myklebust@hammerspace.com> <20180903152936.24325-3-trond.myklebust@hammerspace.com> <20180903152936.24325-4-trond.myklebust@hammerspace.com> <20180903152936.24325-5-trond.myklebust@hammerspace.com> <20180903152936.24325-6-trond.myklebust@hammerspace.com> <20180903152936.24325-7-trond.myklebust@hammerspace.com> <20180903152936.24325-8-trond.myklebust@hammerspace.com> <20180903152936.24325-9-trond.myklebust@hammerspace.com> <20180903152936.24325-10-trond.myklebust@hammerspace.com> <20180903152936.24325-11-trond.myklebust@hammerspace.com> <20180903152936.24325-12-trond.myklebust@hammerspace.com> <20180903152936.24325-13-trond.myklebust@hammerspace.com> <20180903152936.24325-14-trond.myklebust@hammerspace.com> <20180903152936.24325-15-trond.myklebust@hammerspace.com> <20180903152936.24325-16-trond.myklebust@hammerspace.com> <20180903152936.24325-17-trond.myklebust@hammerspace.com> <20180903152936.24325-18-trond.myklebust@hammerspace.com> <20180903152936.24325-19-trond.myklebust@hammerspace.com> <20180903152936.24325-20-trond.myklebust@hammerspace.com> <20180903152936.24325-21-trond.myklebust@hammerspace.com> <20180903152936.24325-22-trond.myklebust@hammerspace.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Convert RPC client transmission to a queued model
|
expand
|
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 5efa9eddf769..95d15d4017f7 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1102,27 +1102,12 @@ bool xprt_prepare_transmit(struct rpc_task *task) { struct rpc_rqst *req = task->tk_rqstp; struct rpc_xprt *xprt = req->rq_xprt; - bool ret = false; dprintk("RPC: %5u xprt_prepare_transmit\n", task->tk_pid); - spin_lock_bh(&xprt->transport_lock); - if (!req->rq_bytes_sent) { - if (req->rq_reply_bytes_recvd) { - task->tk_status = req->rq_reply_bytes_recvd; - goto out_unlock; - } - if (!test_bit(RPC_TASK_NEED_XMIT, &task->tk_runstate)) - goto out_unlock; - } - if (!xprt->ops->reserve_xprt(xprt, task)) { - task->tk_status = -EAGAIN; - goto out_unlock; - } - ret = true; -out_unlock: - spin_unlock_bh(&xprt->transport_lock); - return ret; + if (!xprt_lock_write(xprt, task)) + return false; + return true; } void xprt_end_transmit(struct rpc_task *task)
Remove the checks for whether or not we need to transmit, and whether or not a reply has been received. Those are already handled in call_transmit() itself. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> --- net/sunrpc/xprt.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)