From patchwork Tue Apr 30 14:00:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13649094 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 543B2C4345F for ; Tue, 30 Apr 2024 14:03:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E1A26B00C3; Tue, 30 Apr 2024 10:03:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F33B86B00C5; Tue, 30 Apr 2024 10:03:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5EFA6B00C6; Tue, 30 Apr 2024 10:03:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B33BA6B00C3 for ; Tue, 30 Apr 2024 10:03:17 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7A9FE1C0CDD for ; Tue, 30 Apr 2024 14:03:17 +0000 (UTC) X-FDA: 82066365234.27.8D7C999 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id B9CC8A001A for ; Tue, 30 Apr 2024 14:03:15 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DByRTjAp; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714485795; 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=91B27U8z7Iln6XJD9uh+fX/pmahLPw16tVNP6LRoyow=; b=T2yJz/HNvuoeIBPDcRuSljkvwhnRHlKgbKWabAYvjOHG/cAQplGLLL3Lc37jyBwOt9Rj0U mGJ7OL+bKxJdWeyYmdWXpBiW5EfEj1ezjwRkdZVi8IV24Vht1/sOq09VgonSgta4TCX0lV ejb1Nw3TTsKMW/UEPcAzInk9cfFr1dA= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DByRTjAp; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714485795; a=rsa-sha256; cv=none; b=sJW/XfseZBAglUl2kv3y5Of1Xw42Ws3KU6JVNnetUnfEks+++7edT5kzgpm5G5l6lA5YGU yOZHmZeJYUuNDKyMM24BsJzBbGIIh/+/MTGHnB5+/AiG/gnx1BQ1AT80oaR/E2Il/5+G44 16cCNsgMjBumJ38S6bpooL326fRo5GI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714485795; 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=91B27U8z7Iln6XJD9uh+fX/pmahLPw16tVNP6LRoyow=; b=DByRTjApMqpkyJGAgu4RQd66Vk1gSwNWYR7lrZWhbPq5Ggt+eSyP62+7mfn/zf7BtV9LD/ DLGv2o6egkgOuuhwYqrAFrGOwdcXYr8RJdDGL3J/KAOZf1VqvJjOW2W7mMiKTr5A4zEWct R5hqi3HGfKG5JVCYB0o29MFbT639dYc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-259-9eohxlC1NuGqMNpSzIOC4g-1; Tue, 30 Apr 2024 10:03:03 -0400 X-MC-Unique: 9eohxlC1NuGqMNpSzIOC4g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id A778F823F1B; Tue, 30 Apr 2024 14:02:36 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7904D1C0F133; Tue, 30 Apr 2024 14:02:33 +0000 (UTC) From: David Howells To: Christian Brauner , Jeff Layton , Gao Xiang , Dominique Martinet Cc: David Howells , Matthew Wilcox , Steve French , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-cachefs@redhat.com, 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 21/22] netfs: Miscellaneous tidy ups Date: Tue, 30 Apr 2024 15:00:52 +0100 Message-ID: <20240430140056.261997-22-dhowells@redhat.com> In-Reply-To: <20240430140056.261997-1-dhowells@redhat.com> References: <20240430140056.261997-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B9CC8A001A X-Stat-Signature: bjneyzumcbug3fkezejruxpfdzjereap X-HE-Tag: 1714485795-762136 X-HE-Meta: U2FsdGVkX18sEC88X05qpWGgSZhHTEX4u9WlCzOXkYBnxYgSeanLzojaLW5i5Uwq8yRhAazrs6CDs+zvk2hNCue/p091Y7ERZmLnxfLuPfeJWH19QH6tqPGelbMyPV0RMp4UbZfP7q1mQZ2JB7I79UBOxQOa+LJ7FPuhuLCatiNoShZdk0v7xjGtBs5CHBKszeg8AJxWDZNalIShlkrC+XdBEIYR6bKWVHg6u0RN/qJmJDKeCjj+yIqcArsLa7EvusVNYPAIkvac+lo0y9GnVmiK5Av8aSyh/1Qr4ZFFMnk4Of/A+qGpOyQC336xHxv9wz+ryxrzp4jd7qrzn3uioLIDlo6+dIf+feFdj9HM++u540LAzbD4XQYEtF9rciURMzEQkJgynTRhih7Tn+M4ZvQeWNeNb00jWppOdc7N8ghTO+SypyZnQtEuEU0YKsOw+/fIWgyEcAm7TUnFNv1vdPwddoJC5BZpiIn/y3NcM5TPE3rySAW1Rn+C0nfjHTg4Zx4PL+jPGg2Md5gPlYmvR1CnI5UwYZc8ZScLOrHsAn5bmbzOgivyizJIjCD9EoiI+0MwQm1p43drWp+RMhZLhAPog4GNllPAysD/jkjIKtM3nEvyK7t5Z9/8l+pXEVKtVp7KhRJio+6KGMD+iEv9zAH07MdnnY9HpbPNFqnPJFCPRy6C35/qd/Uq3YkgdUtzgrBZB1XU3vFFIr2PvGNh+TAsLzpoHF77LoTffAHa0Sn/DJQdKev4+yGfawFTDKxtqFzSARukUCPtMJuT+U4/D1qN+tETRlkD05RmsPnJ/dtJlJ1D+ZQPo7VpdHn0jCKtMseTftIZV2fG03lkxeJvDk9uLi+yDaEg4hiJ9rl0bqc2J5yyhc8ScJQTKniR3jkqITwYsP8nkPgBED54I8Eq/oIK7ltt6YrpXuTKFJsQu7vDLDGYnnml0asdCrIkm25J0qCkV0UcbtUZrDqLEtE WJB/627I XiJ0+8r3v+GR/Mlm4paRWkAfWuPUbxvXaKmKCwE24ZAXXsGO/iTA7VV+beFNLRn5bRDCeMAwDlaQr2wMKMb0hz5UVg4bwqDyX+QIujUfpU09j4l7d+2Pp3fFvXXwXAhjhaCAa4LTXikWxQ5KaJxfIXWrylR03v9ew/rDbEt4U3cg3nRo+oIKLxBtHkmxoy+x+5GknB49H5eH56nQ2uZqAKerxRMy+7eEKkUM6/Wdxi21MM993NnSotq/L+C7IY8Z2dl8Z 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: Do a couple of miscellaneous tidy ups: (1) Add a qualifier into a file banner comment. (2) Put the writeback folio traces back into alphabetical order. (3) Remove some unused folio traces. Signed-off-by: David Howells Reviewed-by: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/buffered_write.c | 2 +- include/trace/events/netfs.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index 43d2cbcbe75c..d435f39547ef 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Network filesystem high-level write support. +/* Network filesystem high-level buffered write support. * * Copyright (C) 2023 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells@redhat.com) diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index e7700172ae7e..4ba553a6d71b 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -141,12 +141,9 @@ EM(netfs_folio_trace_cancel_copy, "cancel-copy") \ EM(netfs_folio_trace_clear, "clear") \ EM(netfs_folio_trace_clear_cc, "clear-cc") \ - EM(netfs_folio_trace_clear_s, "clear-s") \ EM(netfs_folio_trace_clear_g, "clear-g") \ - EM(netfs_folio_trace_copy, "copy") \ - EM(netfs_folio_trace_copy_plus, "copy+") \ + EM(netfs_folio_trace_clear_s, "clear-s") \ EM(netfs_folio_trace_copy_to_cache, "mark-copy") \ - EM(netfs_folio_trace_end_copy, "end-copy") \ EM(netfs_folio_trace_filled_gaps, "filled-gaps") \ EM(netfs_folio_trace_kill, "kill") \ EM(netfs_folio_trace_kill_cc, "kill-cc") \ @@ -156,7 +153,6 @@ EM(netfs_folio_trace_mkwrite_plus, "mkwrite+") \ EM(netfs_folio_trace_not_under_wback, "!wback") \ EM(netfs_folio_trace_read_gaps, "read-gaps") \ - EM(netfs_folio_trace_redirty, "redirty") \ EM(netfs_folio_trace_redirtied, "redirtied") \ EM(netfs_folio_trace_store, "store") \ EM(netfs_folio_trace_store_copy, "store-copy") \