From patchwork Tue Nov 8 22:19:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 17242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp10012wru; Tue, 8 Nov 2022 14:22:32 -0800 (PST) X-Google-Smtp-Source: AMsMyM6HwMljGC6axnoxjeUye5/aL49T4L5XCGoI/+xzvDP7Qi9kz9Co5wDtSLhPK4FivjUES7Fg X-Received: by 2002:a17:902:d48b:b0:188:50af:ea11 with SMTP id c11-20020a170902d48b00b0018850afea11mr31999034plg.69.1667946152623; Tue, 08 Nov 2022 14:22:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667946152; cv=none; d=google.com; s=arc-20160816; b=QeWQGybCxL524OtMCAU4ILkTs0SD8+72tzOjOmh9i0BvfcWU+ch2bE4yYwawkd6Epx AWgPvX/6Oo5zGiFdsdRXsVQYvdBQlnUpUMD70k0Tvu8uWWKQz6LcYigaBGvMLHZ22IEo OUIs3UsXNWAhCaa1A7YYkKJEbLiMG9b6eUDbUKaollmIeJVDoggy7sWJh3yO26+1TF80 WmXyAEgOuD9JqxxiefhSDwggnMxqPIi0CF9LXaSrCjCXYf6ZUhqilN/rN0EAxsnftL2Q 27RsR+yw0P6YOtJRedn2IAOAtZxiNNn+4U/+0shHDE62cShwDEbfImYfhRXZxbYc4Tn1 bkqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:organization:dkim-signature; bh=BmYwYEwE3K4lKT0t70YgMsajeLE4ht81LMIqW4jXi8c=; b=x4ht8rTvLCbs808UWMeXAqlOk9ah97iVzS9fTYVTd18rKMhUBAzp85EbQxlq3pPE6C 7RFRHqGga2xDHY/DnSKoPUegROXdnttcsc2fUVcBYTHVFDH8j4xG8sO4ci/xV4rB28m3 ukNutKIZJxaRTEblCOs1TfR3jFDqeYl17faFV57cIXBQV2FWwnkfcda1exkWY00nnof6 C5K8NRkgli+c1HA+H75BgJmrEvH9aEYs9r6oJXdBw0Os/A33am5vyx6BgaOG0ImK6tYT 9y1hItNWqqAiHpDgAGRRBgf6P/KmvIyOqzVjTxw1QffMuK7ejs/vb5rB5zOw1v3hY9do PwVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="V/DrzD3B"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q19-20020a170902789300b0017f802fcffesi14893021pll.410.2022.11.08.14.22.18; Tue, 08 Nov 2022 14:22:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="V/DrzD3B"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229508AbiKHWV0 (ORCPT + 99 others); Tue, 8 Nov 2022 17:21:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbiKHWUf (ORCPT ); Tue, 8 Nov 2022 17:20:35 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9656D657E0 for ; Tue, 8 Nov 2022 14:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667945970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BmYwYEwE3K4lKT0t70YgMsajeLE4ht81LMIqW4jXi8c=; b=V/DrzD3BQ8CyA0SV46NjcXQlG++L5g1tPKCk3LA69ldidhP2WanxAhXha0N2AGQxW9sOxH OBPRkc8jQUz9ZFj+uQOs1Wnb1g3T0GOcgp4DfbstRLINCuy9+3TPczCYTY7QXRLItiAP5T 0F/VWKqLJRdR0y3retEpzEiEn3a6ows= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-301-SOQNcofAN8S3zWT9HdpFww-1; Tue, 08 Nov 2022 17:19:23 -0500 X-MC-Unique: SOQNcofAN8S3zWT9HdpFww-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03382185A79C; Tue, 8 Nov 2022 22:19:23 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.37.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B317492B05; Tue, 8 Nov 2022 22:19:22 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH net-next 14/26] rxrpc: Remove call->tx_phase From: David Howells To: netdev@vger.kernel.org Cc: dhowells@redhat.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Date: Tue, 08 Nov 2022 22:19:21 +0000 Message-ID: <166794596151.2389296.15788531007597364165.stgit@warthog.procyon.org.uk> In-Reply-To: <166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk> References: <166794587113.2389296.16484814996876530222.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748968304808850592?= X-GMAIL-MSGID: =?utf-8?q?1748968304808850592?= Remove call->tx_phase as it's only ever set. Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/ar-internal.h | 1 - net/rxrpc/call_object.c | 1 - net/rxrpc/input.c | 5 +---- net/rxrpc/recvmsg.c | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 92f20b6c23ca..282cb986f8a7 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -678,7 +678,6 @@ struct rxrpc_call { rxrpc_serial_t rx_serial; /* Highest serial received for this call */ u8 rx_winsize; /* Size of Rx window */ u8 tx_winsize; /* Maximum size of Tx window */ - bool tx_phase; /* T if transmission phase, F if receive phase */ u8 nr_jumbo_bad; /* Number of jumbo dups/exceeds-windows */ spinlock_t input_lock; /* Lock for packet input to this call */ diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index a75861a0c477..8290d94e9233 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -206,7 +206,6 @@ static struct rxrpc_call *rxrpc_alloc_client_call(struct rxrpc_sock *rx, return ERR_PTR(-ENOMEM); call->state = RXRPC_CALL_CLIENT_AWAIT_CONN; call->service_id = srx->srx_service; - call->tx_phase = true; now = ktime_get_real(); call->acks_latest_ts = now; call->cong_tstamp = now; diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 59a0b8aee2a2..0cb23ba79e3b 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -309,10 +309,7 @@ static bool rxrpc_receiving_reply(struct rxrpc_call *call) return false; } } - if (!rxrpc_end_tx_phase(call, true, "ETD")) - return false; - call->tx_phase = false; - return true; + return rxrpc_end_tx_phase(call, true, "ETD"); } /* diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index 7e39c262fd79..a378e7a672a8 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -203,7 +203,6 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial) break; case RXRPC_CALL_SERVER_RECV_REQUEST: - call->tx_phase = true; call->state = RXRPC_CALL_SERVER_ACK_REQUEST; call->expect_req_by = jiffies + MAX_JIFFY_OFFSET; write_unlock_bh(&call->state_lock);