From patchwork Fri Nov 3 10:10:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 161219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp918698vqu; Fri, 3 Nov 2023 03:11:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3m8Qw2io85rA77YnMqy9k/97WxPitApDaE4C6mmR692r2mBCTq9e7ES8hZOjTWzpdqSVY X-Received: by 2002:a17:902:c412:b0:1cc:5ce4:f64b with SMTP id k18-20020a170902c41200b001cc5ce4f64bmr3245921plk.8.1699006288261; Fri, 03 Nov 2023 03:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699006288; cv=none; d=google.com; s=arc-20160816; b=k9y35yBP5ck7F1yG9u7T9BTo4LmDGoznK4WkgyXYUruJEqn82hGJoxcqVwk2t7MsVS nXM0ml5GCzMHrLTzstNDqD8KpoYYLFftdNaQzEPf+hBF4C+eEHLAhIoJ5eC0XueMuxMW Rj4i6wwRXXVAMCw3uyIwuliIMrlKZGJcusWYnhOsmOXvCWh7HG/Z6lc9I2Qyh5LTfcAC /vizLUMIx44lCz/ozyeuQzALcff1uBY3GZM6FucJ4udceesWOBz4eKGWDey8WQMzEDpM LqUCfXvaqUlP0Ak1fjxgAFmFqCmwIxCO9B1/X2vtcisD+F8xAfvGnDz8uvwORiNBvOyo nwEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=KDLS3JVaVRD0wwZRHdGBQfSUKjP5e2DUw58VwHGhlWM=; fh=epSlxiKm6a4zklfG+f30uRIxgks+c5jqaH7V58f1XlQ=; b=lDmHPh1EKhf3FWZxf7VvEb++9q/shBtQcsc/9fjwD+6PriD39Zb/6lIDpoHp+POyWG 407FdOfhMxgYfpvwtm0jHhT9rQK6+UC+qxorkCLRA0V0/fvVgOBk/cy9hA6F6Gcap8yM pDLHrX3Q1hI7ghe2yJZHDlPvC0Pr2SoAtEmelQh6N7lFQ40tZcfVZRqo3XNu8Gwrj0k7 7QjLVz5DmqFSc1I9Mc/owsLYK24h4NaFTuQAASGsaydhTNO5+ICsW+e1HjP1piu73VUl oSdgKRX6U4+mKlOkj1ixWrQw3LAkoE/H/t6Xm1FgnORS4uht+rkuo77lOnW329ausHHV zf3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IgcIEcps; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id c12-20020a170902f30c00b001ca344f46e8si1222019ple.245.2023.11.03.03.11.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 03:11:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IgcIEcps; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D2E87828C49F; Fri, 3 Nov 2023 03:11:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347633AbjKCKLF (ORCPT + 36 others); Fri, 3 Nov 2023 06:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347735AbjKCKLB (ORCPT ); Fri, 3 Nov 2023 06:11:01 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C2A0BD; Fri, 3 Nov 2023 03:10:58 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B99F7C433CC; Fri, 3 Nov 2023 10:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699006258; bh=aEwR2a88wWo7zxzWtx4+bapNUSG0wCpCSwkXs01II2I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IgcIEcpsl/8hIBYRrJwoF0KrW3rX5hGwRRjs3cUQrghLZ9d3rozwe96iGrVrzkG6F 3CJBZKLKD7xF4icfvj1C6sIoNmBclFxrkkNJQTTRrbyCrB2YRH6Z51NXbRz2Px6o5z 6jwuKg0h59YeHBb5VOIisTUMqX2Xld4Dv1wK+czVE3QCIQ3uY+Ppvox7ftiFa0oMXN xlRccMkAxHRE96QZ4s8hU2Ahtjhue/kUGqCNRvu64frbB7lbA01ZnIEN+QF/G8cWNL qQI+nokl0meS0DQXgT/4epg843ZQq2ej+rt7ggYaFO/wjuIm8pp6vCux100SnU1Q8+ JC5zHvT0aUx2A== From: Jeff Layton Date: Fri, 03 Nov 2023 06:10:50 -0400 Subject: [PATCH 2/3] nfs: rename the nfs_async_rename_done tracepoint MIME-Version: 1.0 Message-Id: <20231103-nfs-6-8-v1-2-a2aa9021dc1d@kernel.org> References: <20231103-nfs-6-8-v1-0-a2aa9021dc1d@kernel.org> In-Reply-To: <20231103-nfs-6-8-v1-0-a2aa9021dc1d@kernel.org> To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Layton X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1332; i=jlayton@kernel.org; h=from:subject:message-id; bh=aEwR2a88wWo7zxzWtx4+bapNUSG0wCpCSwkXs01II2I=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBlRMcwit8w99fq4KjPsRSUpqRRz5GxUAP6idpx0 s2gLu5iRICJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZUTHMAAKCRAADmhBGVaC FYdHEAC+e+8cdamQyLjy+g//UDgf2TbbzrbnvEeJavqTIHrXLTlAi8WVc3Wx04MfEa+EM44sB2p n538F49kpSdYyDjP/C4zF44mHT0mP9/yi96cC8TsGAVu5floDO8NC4n2eoI7nykRGcBH266+5TK IwhrfxkcfXg8RzrrnmaCIMNl9168HCDShYVgYZf3fEXjdEWVscdIC25xSRSW5T6+R2WPG4Tl7+Z 0v0EWkfTOBvG0P+D4KZDY4Z9GWVoJ97jQ1V74yGfgtODphNI1+a6+5SgCieY3pHa3guzbMJUUoU TlqdderWkpUfc5TRPjsA8yR73QnhisYhMkfqKsVWuMiBBz6u2LkU0bN6m3tBh35XWrLYXTUqoSc Dy7Z16x/2oKFrw4A4xxd/ZJwCGiPoZmJjyjPIOYcH0rd6RA4hwjUj1eyl0txDTgm81kmGGsFoDH dz7J80oZzAE/KO0XvDBx8s7X7nC4b+H+hJdk03tpMJMaIbsRkmzZzWUhhfYRKC+ex+q2cpB3PxG dSVMPbn7tYM5lgnNnzNVyHtxyqFDGWq+9zBslV4tjb2yo2hnQpIdD0cKUkLc9QlFHxP0Sc7sQv5 4TNrw4N/Oq6vT81mhQHXwBTmLSr46vswmH5pwu3Uj6X7eS3UEaxxobzvOTw8PqqcWj61E/j2kEg DBNZFQAbwUiIhdg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 03 Nov 2023 03:11:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781537217469329432 X-GMAIL-MSGID: 1781537217469329432 We do async renames in other cases besides sillyrenames now. This tracepoint name is now misleading. Signed-off-by: Jeff Layton --- fs/nfs/nfstrace.h | 2 +- fs/nfs/unlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index 4e90ca531176..8ad1bed09295 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -893,7 +893,7 @@ DECLARE_EVENT_CLASS(nfs_rename_event_done, DEFINE_NFS_RENAME_EVENT(nfs_rename_enter); DEFINE_NFS_RENAME_EVENT_DONE(nfs_rename_exit); -DEFINE_NFS_RENAME_EVENT_DONE(nfs_sillyrename_rename); +DEFINE_NFS_RENAME_EVENT_DONE(nfs_async_rename_done); TRACE_EVENT(nfs_sillyrename_unlink, TP_PROTO( diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c index 150a953a8be9..0110299643a2 100644 --- a/fs/nfs/unlink.c +++ b/fs/nfs/unlink.c @@ -267,7 +267,7 @@ static void nfs_async_rename_done(struct rpc_task *task, void *calldata) struct inode *new_dir = data->new_dir; struct dentry *old_dentry = data->old_dentry; - trace_nfs_sillyrename_rename(old_dir, old_dentry, + trace_nfs_async_rename_done(old_dir, old_dentry, new_dir, data->new_dentry, task->tk_status); if (!NFS_PROTO(old_dir)->rename_done(task, old_dir, new_dir)) { rpc_restart_call_prepare(task);