From patchwork Wed Jan 31 23:01:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 195019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp80854dyc; Wed, 31 Jan 2024 15:08:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IECDGTx970P6C7Tqfyfo3+gnv31XMcvTT+znHz1tUwZLKkcLBJ/bOcmkTJGDZ2ErOAcIF33 X-Received: by 2002:a17:90a:fb8b:b0:295:cfb2:221b with SMTP id cp11-20020a17090afb8b00b00295cfb2221bmr4726123pjb.6.1706742530336; Wed, 31 Jan 2024 15:08:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706742530; cv=pass; d=google.com; s=arc-20160816; b=ZZB8mWg9/CAUIATFVBQlHQvRkN1nDb11ZJeBie/yQdMmsOez71oXesKO3mKiW/yKzJ jyTf3aXxLReKR9tQ9z8F6Xp8VHBQy4PFkCRTZWlbo7DCMyFYqtqVvPFTL9yBPc8plh7c rgoUXJICmaqLpShRXl1Imip0kOvj+jn9e47R5yoYTipzTHHfPjk3nxF/tsyVMggjS9oQ g8Db9MPme2lAFLO+bknsLLjtJrMmOBd7yaKt8n2tzlr/nMjXYXM1RJVe4EUUT3J9IhIF Jiqtw0IJjwTZPJNlnKNRHtWXbngNW/VziqfrPID6ikT2nJDu5HV5rqHjcBeEyuPD1/jO ZTAw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=0ZHQU50YprFSPbuyOcatbNyS6kCLk6ExFGgMvS5kC1A=; fh=DSTwLJU/T53EXBCGmNQm8kiZLG9X/rYrYZFeyFlURf0=; b=wCKQkDTWCnjbg3bAeLOADsgs7A+w7qC70ADlmuKIw6N7LjfAiYnAPNu0QsRZ/AkP+H 0l06Qqar/mSsoeY4gtM6k0e2btLT8F0FZ0bXiXcH74/jN3bobFMvHwOViZU98ALYolHo D21ubUAaOYgytyvFB63eAmwI1UEXd9WE3IdhwDcHs8TdgUyshZ4puoZh5xhYdArUHMar bDmSP3+lBpqhW1bDSsBgrQAhfcXiCAyEW6C2DtsYApmn3bd1flhlCeYmu+tVXmJawl4x 4tTbb4piHQ9dAlfETyjiIWAQONS63j7vfBpYvMEKMEqguufIbAvqPFOt23xpfY6zcTIJ rXmQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LFi6af1Y; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-47288-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47288-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCVJCYYmVGtHZiS7pqpmO0RpLe1NY6fpa54f5XgdXfAhe2WdWuuWosB8fnh21ov3WdtmPEmPLjyDVlLlX70ONJbqMUBQOg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k9-20020a17090a9d8900b00290f94a9fbbsi2281483pjp.83.2024.01.31.15.08.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 15:08:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47288-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=LFi6af1Y; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-47288-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47288-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 5E3A2286ED8 for ; Wed, 31 Jan 2024 23:03:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A9A723C6A6; Wed, 31 Jan 2024 23:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LFi6af1Y" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC2C93BB41; Wed, 31 Jan 2024 23:02:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706742145; cv=none; b=jiqgUuLLMddO6zDy84cT6eT1zuFW6ZCW+Z3ypvWDz9XQtJjT6YraiIIKTZdL1Wo4eOm/H6K73cU4SNNFNvCr8bMgnlcwG+mgsl/wOvhsUDB6pFx7+QY8lhsBhuFUCpiSEc432wnfIvwaePsMCar9TiA5d/tRO1Av2LOaSK+CGi4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706742145; c=relaxed/simple; bh=KKWqpeEjZJwVDa3yEQ2DNXVtpjOqYRLGgfpS4PiOo04=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=suq0KDyh0u1sx/pZ8END18UO21IB3a09zASOiZOCQVK4/rIVvL9ad0yQK+T0JQmeTEdDDW90VQ+hzEaTw0ax0OIJ2P3o4d1qUGAxfBIdnL3cK0HuDULKsSkLL1qFkYE4+HoKoRwqAXn2qwTn2Qgx2csATN0rll2Osg6hK4q31Uk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LFi6af1Y; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90DE6C43390; Wed, 31 Jan 2024 23:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706742144; bh=KKWqpeEjZJwVDa3yEQ2DNXVtpjOqYRLGgfpS4PiOo04=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LFi6af1YytnN7opBUJgwjt7ugVYMCXGVw9A0t/RBZpLlWcy2/OhDNVcRShOBNI/35 9bHCsISvqPqviqyEsMONvetqYJoV6LSxw83EvF7Z4Nc/PM4o4WIFspfWE8hlD3cv6N GTGdaBjby2/MIUepOfWLTnQBEEg7QAIAhNFCp2dqjIedEchVdnkEcfOoeHlIHeZ3R+ gJviNDEQAO13qGfyURWuTW4BoRZgiXbWLEsjrPaYrapZuw0rcpROxBZ1oBISyXFdSr tTLiLw80K4ZX4jp7FzaVAXwP4ZTLBbBjX05SfZnSm4HDqJkgGv1f7mSdzm5AFOSX5o ALzADMJuOE7SQ== From: Jeff Layton Date: Wed, 31 Jan 2024 18:01:43 -0500 Subject: [PATCH v3 02/47] filelock: rename some fields in tracepoints Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240131-flsplit-v3-2-c6129007ee8d@kernel.org> References: <20240131-flsplit-v3-0-c6129007ee8d@kernel.org> In-Reply-To: <20240131-flsplit-v3-0-c6129007ee8d@kernel.org> To: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Chuck Lever , Alexander Viro , Christian Brauner , Jan Kara , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Howells , Marc Dionne , Xiubo Li , Ilya Dryomov , Alexander Aring , David Teigland , Andreas Gruenbacher , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Mark Fasheh , Joel Becker , Joseph Qi , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Namjae Jeon , Sergey Senozhatsky , Miklos Szeredi Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, ceph-devel@vger.kernel.org, gfs2@lists.linux.dev, linux-nfs@vger.kernel.org, ocfs2-devel@lists.linux.dev, linux-cifs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5841; i=jlayton@kernel.org; h=from:subject:message-id; bh=KKWqpeEjZJwVDa3yEQ2DNXVtpjOqYRLGgfpS4PiOo04=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBlutFujIsQIjNiz3uqjJC8wcRTOIuNqoQDPhB6L kLvOHpJtvKJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZbrRbgAKCRAADmhBGVaC FeYrD/9x8UIT7eXHwJrckEzY2O7WTa9GLKAOrzBWKkQcN6WD07ftBdEii3/9FV4bNh7HdVtA+QT eWwcrZ1XKAEs3NpiATsLdCLx9KX6fKpYgfZ1lFDhU6VS5Px62ywyyUNoLUpcUNOA0ThK7Qva3LJ DdHzWaEQ/URYXwX/5nYIO79Cj8qJF4Iuibex0iupzu9SGFUO3C8Hmiw9BLcjNBerCG0n8B5ywJ1 2wT0ye6e8Rnge+fBdsuxoLeWP46188RVH1WXapWlRF3A5j3zsW/0ILvYwkokBXFR1ryq4SwKGP6 X2wG9jaElUgvx+/PFhy8o1wPNUrB6Y3DPebbFOqhBl8MLcwrosfNP5zP8VqXZH327qyWH367g5s gWDyK9o9ArLElXGybjk3jXqYsObGe+j7Ozgbus5IhjbBJMw/wAZxApkJCuVzuyZMeKe3reIt02Q ALOGIE/J5gBhV/IeUZEML4KqcbOW/1kxJnNPKy8yIAgJ6R0coaXsRWwdGrw7kU62hc19ujWAs4o rkFiVonha46LxWhkGvVmSCrEawrCRdeigoe72bNhFKWFBvadJkl9I5vOQbi/AaLpgKwukf+05Lj ZXAULAuTtP7bLh7dTi5iLv8/OkT9qG2kO2Oqx+U9TIeRdllZ10wx6lJZ0sFqSTuIQvQqLOWT83e OfceXo4rvpY9yPg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789649255388913153 X-GMAIL-MSGID: 1789649255388913153 In later patches we're going to introduce some macros with names that clash with fields here. To prevent problems building, just rename the fields in the trace entry structures. Signed-off-by: Jeff Layton --- include/trace/events/filelock.h | 76 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/include/trace/events/filelock.h b/include/trace/events/filelock.h index 1646dadd7f37..8fb1d41b1c67 100644 --- a/include/trace/events/filelock.h +++ b/include/trace/events/filelock.h @@ -68,11 +68,11 @@ DECLARE_EVENT_CLASS(filelock_lock, __field(struct file_lock *, fl) __field(unsigned long, i_ino) __field(dev_t, s_dev) - __field(struct file_lock *, fl_blocker) - __field(fl_owner_t, fl_owner) - __field(unsigned int, fl_pid) - __field(unsigned int, fl_flags) - __field(unsigned char, fl_type) + __field(struct file_lock *, blocker) + __field(fl_owner_t, owner) + __field(unsigned int, pid) + __field(unsigned int, flags) + __field(unsigned char, type) __field(loff_t, fl_start) __field(loff_t, fl_end) __field(int, ret) @@ -82,11 +82,11 @@ DECLARE_EVENT_CLASS(filelock_lock, __entry->fl = fl ? fl : NULL; __entry->s_dev = inode->i_sb->s_dev; __entry->i_ino = inode->i_ino; - __entry->fl_blocker = fl ? fl->fl_blocker : NULL; - __entry->fl_owner = fl ? fl->fl_owner : NULL; - __entry->fl_pid = fl ? fl->fl_pid : 0; - __entry->fl_flags = fl ? fl->fl_flags : 0; - __entry->fl_type = fl ? fl->fl_type : 0; + __entry->blocker = fl ? fl->fl_blocker : NULL; + __entry->owner = fl ? fl->fl_owner : NULL; + __entry->pid = fl ? fl->fl_pid : 0; + __entry->flags = fl ? fl->fl_flags : 0; + __entry->type = fl ? fl->fl_type : 0; __entry->fl_start = fl ? fl->fl_start : 0; __entry->fl_end = fl ? fl->fl_end : 0; __entry->ret = ret; @@ -94,9 +94,9 @@ DECLARE_EVENT_CLASS(filelock_lock, TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p fl_pid=%u fl_flags=%s fl_type=%s fl_start=%lld fl_end=%lld ret=%d", __entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev), - __entry->i_ino, __entry->fl_blocker, __entry->fl_owner, - __entry->fl_pid, show_fl_flags(__entry->fl_flags), - show_fl_type(__entry->fl_type), + __entry->i_ino, __entry->blocker, __entry->owner, + __entry->pid, show_fl_flags(__entry->flags), + show_fl_type(__entry->type), __entry->fl_start, __entry->fl_end, __entry->ret) ); @@ -125,32 +125,32 @@ DECLARE_EVENT_CLASS(filelock_lease, __field(struct file_lock *, fl) __field(unsigned long, i_ino) __field(dev_t, s_dev) - __field(struct file_lock *, fl_blocker) - __field(fl_owner_t, fl_owner) - __field(unsigned int, fl_flags) - __field(unsigned char, fl_type) - __field(unsigned long, fl_break_time) - __field(unsigned long, fl_downgrade_time) + __field(struct file_lock *, blocker) + __field(fl_owner_t, owner) + __field(unsigned int, flags) + __field(unsigned char, type) + __field(unsigned long, break_time) + __field(unsigned long, downgrade_time) ), TP_fast_assign( __entry->fl = fl ? fl : NULL; __entry->s_dev = inode->i_sb->s_dev; __entry->i_ino = inode->i_ino; - __entry->fl_blocker = fl ? fl->fl_blocker : NULL; - __entry->fl_owner = fl ? fl->fl_owner : NULL; - __entry->fl_flags = fl ? fl->fl_flags : 0; - __entry->fl_type = fl ? fl->fl_type : 0; - __entry->fl_break_time = fl ? fl->fl_break_time : 0; - __entry->fl_downgrade_time = fl ? fl->fl_downgrade_time : 0; + __entry->blocker = fl ? fl->fl_blocker : NULL; + __entry->owner = fl ? fl->fl_owner : NULL; + __entry->flags = fl ? fl->fl_flags : 0; + __entry->type = fl ? fl->fl_type : 0; + __entry->break_time = fl ? fl->fl_break_time : 0; + __entry->downgrade_time = fl ? fl->fl_downgrade_time : 0; ), TP_printk("fl=%p dev=0x%x:0x%x ino=0x%lx fl_blocker=%p fl_owner=%p fl_flags=%s fl_type=%s fl_break_time=%lu fl_downgrade_time=%lu", __entry->fl, MAJOR(__entry->s_dev), MINOR(__entry->s_dev), - __entry->i_ino, __entry->fl_blocker, __entry->fl_owner, - show_fl_flags(__entry->fl_flags), - show_fl_type(__entry->fl_type), - __entry->fl_break_time, __entry->fl_downgrade_time) + __entry->i_ino, __entry->blocker, __entry->owner, + show_fl_flags(__entry->flags), + show_fl_type(__entry->type), + __entry->break_time, __entry->downgrade_time) ); DEFINE_EVENT(filelock_lease, break_lease_noblock, TP_PROTO(struct inode *inode, struct file_lock *fl), @@ -179,9 +179,9 @@ TRACE_EVENT(generic_add_lease, __field(int, rcount) __field(int, icount) __field(dev_t, s_dev) - __field(fl_owner_t, fl_owner) - __field(unsigned int, fl_flags) - __field(unsigned char, fl_type) + __field(fl_owner_t, owner) + __field(unsigned int, flags) + __field(unsigned char, type) ), TP_fast_assign( @@ -190,17 +190,17 @@ TRACE_EVENT(generic_add_lease, __entry->wcount = atomic_read(&inode->i_writecount); __entry->rcount = atomic_read(&inode->i_readcount); __entry->icount = atomic_read(&inode->i_count); - __entry->fl_owner = fl->fl_owner; - __entry->fl_flags = fl->fl_flags; - __entry->fl_type = fl->fl_type; + __entry->owner = fl->fl_owner; + __entry->flags = fl->fl_flags; + __entry->type = fl->fl_type; ), TP_printk("dev=0x%x:0x%x ino=0x%lx wcount=%d rcount=%d icount=%d fl_owner=%p fl_flags=%s fl_type=%s", MAJOR(__entry->s_dev), MINOR(__entry->s_dev), __entry->i_ino, __entry->wcount, __entry->rcount, - __entry->icount, __entry->fl_owner, - show_fl_flags(__entry->fl_flags), - show_fl_type(__entry->fl_type)) + __entry->icount, __entry->owner, + show_fl_flags(__entry->flags), + show_fl_type(__entry->type)) ); TRACE_EVENT(leases_conflict,