From patchwork Wed Aug 14 20:38:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13763957 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B3CEC52D7F for ; Wed, 14 Aug 2024 20:40:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A810D6B00A1; Wed, 14 Aug 2024 16:40:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A316C6B00A2; Wed, 14 Aug 2024 16:40:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D2BF6B00A3; Wed, 14 Aug 2024 16:40:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 6CB696B00A1 for ; Wed, 14 Aug 2024 16:40:23 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7376D1C2C09 for ; Wed, 14 Aug 2024 20:40:22 +0000 (UTC) X-FDA: 82452018684.10.C5FD4FE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id BF0E04000A for ; Wed, 14 Aug 2024 20:40:20 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eOaUj4PC; spf=pass (imf01.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723668008; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WqmeAIFtHY/CwyA/vjZ+IfoBU5cuDLNukUcIV4khXxI=; b=1A4s8fcna++HI6rQnww8fIeAwbfUJPNSiz9lPn+cJOjVOLO0uRTggFpk8l1hJGo67hqw4J 4GE3GsQ1T4O56tJLxQyiDQS0PsYdu3F/xTeDq6Uy7jSjs+rx6Yfyxj+XS2qbeFm9OqLCyW IZnL0D22KopbzV/H272Ho1SXOArDA7Q= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eOaUj4PC; spf=pass (imf01.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723668008; a=rsa-sha256; cv=none; b=FL33XXWWGfMLihlYxvvnNnImEJG5B4HKw8IkjXjeFR/C1RCQKbY05Pz9An1aZ+qy2Hi8E8 bCe0VYNM5NtUZfgMUtTpC5sCVBI0jOflolNfIqD02l0fiFO/mPNWrFCCpLyxeiCby6k+YH cIfTyS7PRHfihjEs+/wuPGCxORh9Nuw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723668020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WqmeAIFtHY/CwyA/vjZ+IfoBU5cuDLNukUcIV4khXxI=; b=eOaUj4PCnWbgIIftO3+aSNY9iRdseNkfvp1Xs9tLC5YxAZ/KnPIWGsDr6Ig+9WHpwnPdBG TrfAVBf8B9xrso5ajN4umPCDS75loYwpqs49L0XLa7WvWuqNTi/a5iWcV8diH3nOULanvz +jiU6jP+UK/zUQus9lFrcGUEf1qRitU= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-214-VGEIqNK5Ox-3wfRG2S8vKg-1; Wed, 14 Aug 2024 16:40:14 -0400 X-MC-Unique: VGEIqNK5Ox-3wfRG2S8vKg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 78B6D1955F43; Wed, 14 Aug 2024 20:40:11 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.30]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D09D119560A3; Wed, 14 Aug 2024 20:40:05 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French , Matthew Wilcox Cc: David Howells , Jeff Layton , Gao Xiang , Dominique Martinet , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 09/25] netfs: Remove NETFS_COPY_TO_CACHE Date: Wed, 14 Aug 2024 21:38:29 +0100 Message-ID: <20240814203850.2240469-10-dhowells@redhat.com> In-Reply-To: <20240814203850.2240469-1-dhowells@redhat.com> References: <20240814203850.2240469-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspam-User: X-Stat-Signature: 3jnjigr3aisu13ibos6bbekp6xekhnpy X-Rspamd-Queue-Id: BF0E04000A X-Rspamd-Server: rspam11 X-HE-Tag: 1723668020-743484 X-HE-Meta: U2FsdGVkX1/GS6IVcbQYpInMBWBdAHPJMf2nHz16dGWz5/yEyzAU1SOBZVM6LyIccCWs/8HANOVXtylmeObrO16e5mteyKzaLSRenXsobjtmSyiyPM21uMBDVU5ZjUSvX7rRpGfz6CtjvAlpENoSlKERMfAFBEs7Y18fKeMdWfztRfweIkoAiwe3DjJnOFFaub9IklOwHjgNslKNm0Nc4ekkpfFrAcxG2C5RbrIg+OuXv5cXT6jZSaPuaCTSv8gmezSHqEXWqWIw9HfMAijeeC1DD3/pQfsDs24+Atdg43rst80rNnmvvVOjFbYxhk4hhZrudsFgNTW5O5cxzBA9GnSCZD33fXSi2dIDtTYNC0NfjPyWxpkI+d8QhgxaZUYBZodrR/HEirjZhRb3cc/pL+Kg5PELWswuJWzvAhWrffm+S7DOEMex7qbxToFB1su2WJAlAYJdTillYmqSshq2OcDeqp+QOElQBfQBfKtoJJXy+LUBo3/hVj+u3rxbRa5J2F43IqSvSV/SBGkhEvT7Deaat7U84S1GzG4giMbLXkfWI/gA7BdCzpoZuBnPRIHgmXYWiDVcsZDkO/Pwrplg56nsEbIzPQPOFMSkkdjVM3j78y4sTQRgoDv3GTdCEUuO5Erg5AZQtdp37i5Dtt9O6yO3gDbnTYOJr82BClJGBrUN91jm0C1Oktzfuqq6QJwrqa2XJ3bQ5ETmIdTU/fr/vCEaOYJ6eC93d7V6oC+dDtTyAP24QC5M3fscegjfrwrOKKYhJtKyXyHGVFwFE9kQCiJy/WjZNoP4bW5BcFD49RDzwpli6WEzwjgMXFNNk3m8tpCpkFT45zG7P7mwAHUGucJ00ocO6gow+392XIgYU0S6ipQSD5MwEVT861onqXTMYocVApruWT3Ucvr/ljqGdAPyr1EkYsbYI8szqiz/zWKIKbZHXOLySlC9vM/IHCiyLBdSqhSEnfgrR2/HzyT llQJlAQS drrzFXKrj4iZrv2CqbMTWAaUqpcoy2q599PAkcRwUPGq8luUZAxDryTprghMXSvQ3ZPSD5Dbxnq9pDk2qvDZJ1qnH1xPxhTk5xGYKI3CALv36aCuX6yvoAjGYUD5CBZORJMjTZbXlvRGMXxxaFFx90Y0O0tNAYIwj7PoVDGLNgw4eGB4EwAhOm3F6I8hS7Sef7ik0WeQE/Db+3GA2U3hWZwLhzswE+BU9WnLcrwYQFyPNrsTWUP1YzISMr8tdC2HxxM3tJqNmd/jBfiALYkjkFtCXibB9ifps7D46F7+Y3eA/6YHKw09vbhj5i/2vaEzih9iUJJM0y1T4MVuNCJPYf8vyATpIfWizJDN+f8CRw3kIaisHoxhd4lwA8VrF2BKTMvF59wNSO6LlzSjYbiBpg2plaQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Remove NETFS_COPY_TO_CACHE as it isn't used anymore. Signed-off-by: David Howells cc: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/main.c | 3 +-- include/linux/netfs.h | 3 +-- include/trace/events/netfs.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/netfs/main.c b/fs/netfs/main.c index 5f0f438e5d21..1ee712bb3610 100644 --- a/fs/netfs/main.c +++ b/fs/netfs/main.c @@ -37,11 +37,10 @@ static const char *netfs_origins[nr__netfs_io_origin] = { [NETFS_READAHEAD] = "RA", [NETFS_READPAGE] = "RP", [NETFS_READ_FOR_WRITE] = "RW", - [NETFS_COPY_TO_CACHE] = "CC", + [NETFS_DIO_READ] = "DR", [NETFS_WRITEBACK] = "WB", [NETFS_WRITETHROUGH] = "WT", [NETFS_UNBUFFERED_WRITE] = "UW", - [NETFS_DIO_READ] = "DR", [NETFS_DIO_WRITE] = "DW", }; diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 16834751e646..ae4abf121d97 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -206,11 +206,10 @@ enum netfs_io_origin { NETFS_READAHEAD, /* This read was triggered by readahead */ NETFS_READPAGE, /* This read is a synchronous read */ NETFS_READ_FOR_WRITE, /* This read is to prepare a write */ - NETFS_COPY_TO_CACHE, /* This write is to copy a read to the cache */ + NETFS_DIO_READ, /* This is a direct I/O read */ NETFS_WRITEBACK, /* This write was triggered by writepages */ NETFS_WRITETHROUGH, /* This write was made by netfs_perform_write() */ NETFS_UNBUFFERED_WRITE, /* This is an unbuffered write */ - NETFS_DIO_READ, /* This is a direct I/O read */ NETFS_DIO_WRITE, /* This is a direct I/O write */ nr__netfs_io_origin } __mode(byte); diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index f4105b8e5894..47cd11aaccac 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -34,11 +34,10 @@ EM(NETFS_READAHEAD, "RA") \ EM(NETFS_READPAGE, "RP") \ EM(NETFS_READ_FOR_WRITE, "RW") \ - EM(NETFS_COPY_TO_CACHE, "CC") \ + EM(NETFS_DIO_READ, "DR") \ EM(NETFS_WRITEBACK, "WB") \ EM(NETFS_WRITETHROUGH, "WT") \ EM(NETFS_UNBUFFERED_WRITE, "UW") \ - EM(NETFS_DIO_READ, "DR") \ E_(NETFS_DIO_WRITE, "DW") #define netfs_rreq_traces \