From patchwork Thu Mar 28 16:34:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13609094 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 C45F8CD1283 for ; Thu, 28 Mar 2024 16:39:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B1826B00CA; Thu, 28 Mar 2024 12:39:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 562C06B00CB; Thu, 28 Mar 2024 12:39:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B4E26B00CC; Thu, 28 Mar 2024 12:39:08 -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 19C4B6B00CA for ; Thu, 28 Mar 2024 12:39:08 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E02E81C020D for ; Thu, 28 Mar 2024 16:39:07 +0000 (UTC) X-FDA: 81947007534.01.1EA0D08 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 3D78A80005 for ; Thu, 28 Mar 2024 16:39:06 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XKVdEoGV; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1711643946; 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=456sspCvb5RC8F6uPLvmqcL+ECbtkHJJvcCgmdRCz9o=; b=uSV9+FKCU7MRelbTU+j5nCn5eGsrPeKTv0psgXP9ogN62CpXHCpthKhK+OZSJnk7NkW9m4 gS4jF4iVKMMJK/iefS3N5P0xQypjtsye0f60Zr7qzvBI5jsHWTfIGlXKAU58meqEJ1JJFG MFujGTc/KtvinorgGplOWGH1523G1bg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XKVdEoGV; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711643946; a=rsa-sha256; cv=none; b=6AjNeiSse29iUwqG8BMG5TgyYurEid1ZV6FlhVo/dnmNroOu1YUoDfN0o4zU5X2Iyd9ncL XC503SNQdLBaCGguOebWVY1FYYa0iUG9Sil2jKayqvOKaohJSMNZJeQuxBCGBt+WQuZAC6 1AYtocw9jHK28vw7au66eLmFPXwVR68= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711643945; 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=456sspCvb5RC8F6uPLvmqcL+ECbtkHJJvcCgmdRCz9o=; b=XKVdEoGV7Xbdwi0Mg5i7qHIh7uRMJaf5FJTdluxPRUqefJ+ct6NDc9XMOquUBaDV62zA9X DRkieRN+81DxI4WaN6QnFFV3YyRnNoD8lSVl7/TqYHqCxJ1Q5PDKOMBM8VJ0o66rakbPWM 8oqTP8epmH+af2tgTk0oIBnj/Ur2lDc= 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-180-5Oh98SDqMqqEMoYuR2MDaA-1; Thu, 28 Mar 2024 12:39:02 -0400 X-MC-Unique: 5Oh98SDqMqqEMoYuR2MDaA-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 02433933EF8; Thu, 28 Mar 2024 16:39:01 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1AEB1C060D0; Thu, 28 Mar 2024 16:38:57 +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 25/26] netfs: Miscellaneous tidy ups Date: Thu, 28 Mar 2024 16:34:17 +0000 Message-ID: <20240328163424.2781320-26-dhowells@redhat.com> In-Reply-To: <20240328163424.2781320-1-dhowells@redhat.com> References: <20240328163424.2781320-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Rspamd-Queue-Id: 3D78A80005 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: zu5j1autwys3gspx7x9jnmohqm65qi4o X-HE-Tag: 1711643946-655118 X-HE-Meta: U2FsdGVkX18ItEMEVRcS0LzbtDbzN5pGWduj/2vR22npSpPXFJshTfX1De7JJS0Y4N8AUAahPB2KqHRJFSgG7o9RiyFzcGC4L+9v4VAjufCOrcYpycDsZIyTuRgApfYsDqalV5E32aStLIM7RImv+UHb3vuXUoIgKa5rdTc0E4TsZ/6TqvQJsQH9Fy3ao4kjjUnEHxvvaTrI8BqFgLCo01wGIyErFMrf1L4J44uUo5nFFpHRE1HosK/EfP9xBS5YWymiBu8+5TQvXnZ+DHfm+0b09vgP5n8p8Mr54E2WBTMy3TeQep/4sHfsxPAUzklGOtxTF3pHlRvph4x0OPy4jJ3kPgdGtOLi7BVsMFNhIMDCbCmB2pBIQkid7SRclNEOY/aMQWMcgjbIqVCV8O8wjYgnWaI9mA6Dvr2nEvXVHbij/NbipYZvAv4Ne+M67l458qMH6LM7OEAvNVKJmSTLqKeJ6REuAXdFw/k5ZwzZ8i/wTahyvN57FAdd8UgiT7HBjZrE/VEytz9sMSJxrJA99WRM5OPT3rLm9z7fu+2cMdBL7NiL6HCN0MVRoiqRx2nno+XruG5JsAUNPAWBGCux8NSpkRA4FJciouSSh3AU2GVJuYFMmKQ4jL92xG4ntcbGYTlkgwsOd36UEvshIxDSZ7KdwpR4kAt09U32vkG/eV4gqKsrBNb0I3ZBH+MdGccajlhNZ5CBJsX00ep3Q7qPewFPSoknTpd5ZQDfO7jOdqG0LrxLA5qcopJUuDqFoZGq6gtZTq3hinpbfPq3EU2GGFu/8Dr843ZX9dRBZ2R7xsol0mLI2xxcJUsnyArieCMA3RGAumDkEBSkHsykXXlheGATV/+SYbT0feVVxeVtdiEfaKvpZrUwCKW1T1aTclaR/h2zVCbTPqB/IuTx921pYqdODHCAnh2n9eZsXc3aDzmCAae8d9vCAV4JNzCvqVYD0Wp6HdG7idQ3G+Nirxf s1GZcc9Z BAwzVf5iOUre5dwORKGDj2lVN5XoWkYql8T83Qt+avhYG/ExUd3c1Nepf3LhESRS7ENQ1ryHtlhwQyI2wmL8dJbmj8QU7lUhp75EMdsQvj0T/dgD3vboE51F2YWlmIQxy7PlVW05maGbONNs0U/0zdYYyF584IkNizKft9MWFG5WDseT0S6siv1TXpKW2fl261rvRURmOkgFZJtiOb/cB5VY6kNJB+46s8gBzUgPdapZs7ofNbF1TrHW/DpsP7jUeOSr9 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 cc: 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 2da9905abec9..1eff9413eb1b 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") \