From patchwork Mon Jul 29 16:19:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13745293 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 1087EC3DA7E for ; Mon, 29 Jul 2024 16:21:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2F3A6B00A5; Mon, 29 Jul 2024 12:21:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DEF56B00A6; Mon, 29 Jul 2024 12:21:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A7216B00A7; Mon, 29 Jul 2024 12:21:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6CBF36B00A5 for ; Mon, 29 Jul 2024 12:21:38 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2FEABA0368 for ; Mon, 29 Jul 2024 16:21:38 +0000 (UTC) X-FDA: 82393305876.17.B83105C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 601CA100033 for ; Mon, 29 Jul 2024 16:21:35 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=STUxyz65; spf=pass (imf14.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=1722270042; 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=VaCJib0YVbDCLysCH93azqktUZ6nzBMH27AQ6nd/ato=; b=rZFEvKzeYqPQ7Ti/WzIFaGB4IITeum20wv7tHK0Xc6jGDqKDqXq7Nr2DPd8Wis0PyjIo9w 8wEDqcZ1bmjq6Z9QKUYMWbGWrOadxJnmBE9DFQ1HLZ90EbFb2Tb2VVUThFbpEtWWZnJ7mm dj6TKlovVleuG4jSfP2qY5sA6I5F/Ro= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722270042; a=rsa-sha256; cv=none; b=g3/VdyKjzBrxzTsP7z68wBdGjqAa5zv7T0NDpGHCVhj5tUPwggQf69QJ0acYt2XNrVb+/b mSGgzQRwMXOzBetYJMgm+XSXpwt7ULJNssp4b7wEOXql/JCSKkIBCs10Hlwdx5ygPpw0yG q97zYTBopfVQCF7mmW8EpDA/f/SpvsY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=STUxyz65; spf=pass (imf14.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722270094; 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=VaCJib0YVbDCLysCH93azqktUZ6nzBMH27AQ6nd/ato=; b=STUxyz65TIpI/XFMC3MdB+0sIcVl5P/HcYP5KrF4F2gLnD6INbZQGGwAELlb7TbXxu6yrZ y5oowlhpxKs77aK0+sS8ZvV1jFqzk1pFICH/1g8jJv0saf+ryAB1nwzY1RAYoCH2u3hM+f oGStF3NOWREMt+W0Zki3CR05e5LFtF8= Received: from mx-prod-mc-05.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-250-902ZwM7xNvy1JIDLmrqLCw-1; Mon, 29 Jul 2024 12:21:25 -0400 X-MC-Unique: 902ZwM7xNvy1JIDLmrqLCw-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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 363661955F40; Mon, 29 Jul 2024 16:21:22 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.216]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 368ED195605F; Mon, 29 Jul 2024 16:21:16 +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 09/24] netfs: Remove NETFS_COPY_TO_CACHE Date: Mon, 29 Jul 2024 17:19:38 +0100 Message-ID: <20240729162002.3436763-10-dhowells@redhat.com> In-Reply-To: <20240729162002.3436763-1-dhowells@redhat.com> References: <20240729162002.3436763-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Stat-Signature: 3f6zm4ywwfu9uyz94yawhxjfhdttz6qr X-Rspamd-Queue-Id: 601CA100033 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1722270095-855697 X-HE-Meta: U2FsdGVkX1+xaCNc0gu8hBykxnhiwl+pnRhvWBBhXed1d0M2B7HdGE15gXiKSvJYgB6BIgcBHYieDzyYgx14dOWnkds+q6RG/0J3DVBMPQcDuj+SBGQ7exqodqfbCY2dKY4mrt/ImgdXvhbEf29cBmXpqyvsuDBCENT6g0OTA38EJw6I8e7SlPWwiTQyBurms7tF/0cu7DmPPfSACiXbUSm/PH06NZTC/MAdkbwEFVYVHrC0QF0lYedmPEi2hQ6ljr7PFuW3cR3+NIm7lYLunsleyT7Y46kJNlo47v6owdSVQgRvT+4npWWRmzM8mPvv1DpbcJ4ULYHynSj7YXEw625Q9hQIo6iX6pYNLMfQSBa96F1XQ3Z2c3/fyPePTNFF6ZkO8n+eVUPCMUBtbALT86ucj6+PAPl1+PnXp7HpqB1Q7aKdo7ONYgoh/p0p6hFLzS6UIyfTQkBexh136MyyAVTkIsaCHPdhqKttz4eefnXEic5M5x9JLkyUV9nm0AMNKZVSxcSukMLdROUyzFVWF2g7L4wXlaYdAiWLYta/hFNPtVxVTPIrxfhRITWDyWmgmbEq9eVP4W+uquqxJeEi96PuFkzahdUy4aBkCo8qXxRMNCBqpJQlExxI04S96ln3OE/m/7RPCZp4pEwryO3mqjkQtmPJu8D2xoSY+ZImQGWK11q+3O6HK5oHoR9XVjnpcYCCjcEFhhZ81X9m1jAG13LrfiXaSjtLnzEopew2TrIgDLFpMjmiAiCpkdaL8fq3WbdMuMUVMLlWzX3S6qoq2iJfc8WabUFGksN93Rhdd7pD8DeKLY+0yjAnItSnLOEEh4FugdkcZvZ+ApQoPr5aTYEkWt2Zg3/1DKatwJNwbvUZMH4xH8XQ59g6FkmWtXZWupZY96DhayU6awo3Ci2fqyiKfNNQGvtPT6+DX7Z/bWLmZOkYbgXFtWJiLQPKQ8tKl0GVS17Tgp+JBJ5vEw1 rOGOzuuw lmlIW8syoH56L9muPDhCefkm6tlayC0Er7wsidoP2VohU8l6npF2zVYszUn3TM6MgFN6h4Ol1I4+Uj/162/NBdQf47WeBYhyca+qFtz796nM2z5FC42cz7Y/Go1IWO3tnpKKDkaAsZZYb/mfXktz2/eMFpm1RdA+N/ulKwhQD7ohFAAKnQBznnGlD1bds4TzK18P5LF+692TT77CiBUT7ozC8x8UIEvLzrFHL+WjkW4y5BIeZ85cwROHvMB1c9oIb7kLxSq6x63DlYGvED+WbYDpNenK1YLqcBfBtSdq62nj2bagxSuKhvZvVyiZR2DQJUMHUbf8+zrntGitJEUEQuepzNn9YqNyYxiub80bgYjfIGlgmkx0NHUJiNRnUF33z9W26r01JUs5TErJBamJGwhjOZg== 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 5e623e52e5a2..daaa6eae3a9f 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -208,11 +208,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 bd4f6f1f1040..b5a30d9a0d20 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 \