From nobody Tue Apr 7 18:51:21 2026 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 A398834FF45; Wed, 4 Mar 2026 15:35:39 +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=1772638539; cv=none; b=GbiLGZsS7GRxnqmhj0pF/2K0KP5VB6jtx/kolVJLuX+xXILMDNDdJe6GyUQBskrEZ9Cqw7CH5TAwkmXOubgEUtUulfp5ISB+ve70K169z3Zhgko4vqkCi4k6eCF3/WUeFPxq9yBocITWl1OWfcsVPtmZ9PhlGuiQPwOkXJujZ5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772638539; c=relaxed/simple; bh=mpnoRGuSw4SxSNPrcDcSDKeNXRSk3u7CSRiG/C+Xaqk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OmeYqYuDiq4MLjMJkZYQKscadVtI0K0sROK90i/bTB8VARLrLAgQ9ZUtzyUnT5MhA9PEUr8x0dyX8al4eHhjnR+49mKzfMwViilbWKWxa6220BiWlD5gdbnZmjzmbqhqFiLrh0pYl9JhvRYX905sm8WadoMtzsEeUmo+I+SfZYY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qHsmhUdT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qHsmhUdT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA608C2BCB9; Wed, 4 Mar 2026 15:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772638539; bh=mpnoRGuSw4SxSNPrcDcSDKeNXRSk3u7CSRiG/C+Xaqk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qHsmhUdTZEg0otM6XnSRS7XUYwA7DkiF4flLtn6zGmgl7LOE8x+wgKqPLQdCje94E cs3Ow50P8lDeAaWzL3YhxMhuHtJReTgJNlk8vYUzIA1OM9LUIbRkhXWwQhZnHjvjSx CJ4WTm9BXAJTGIPIfkfg1BL+SGRWiANnpoQp94ThtAdUpWTsiUWS/MbYCmrKutFniq /m+wVNRwajSaEhhPd1di94QHPTrK7X6TJdrE4MYOZrUaZHEEGMDJ72ks3Ryt4zFFbr kUiG8MlUylZTdTx5rpuxUMWRb6cd9DjAZL+nvLuwaZ47BoeeMiQXddBrsoCJlEQV6W u5L2tZxqtQP2A== From: Jeff Layton Date: Wed, 04 Mar 2026 10:32:40 -0500 Subject: [PATCH v3 10/12] f2fs: widen trace event i_ino fields to u64 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260304-iino-u64-v3-10-2257ad83d372@kernel.org> References: <20260304-iino-u64-v3-0-2257ad83d372@kernel.org> In-Reply-To: <20260304-iino-u64-v3-0-2257ad83d372@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Dan Williams , Eric Biggers , "Theodore Y. Ts'o" , Muchun Song , Oscar Salvador , David Hildenbrand , David Howells , Paulo Alcantara , Andreas Dilger , Jan Kara , Jaegeuk Kim , Chao Yu , Trond Myklebust , Anna Schumaker , Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Steve French , Ronnie Sahlberg , Shyam Prasad N , Bharath SM , Alexander Aring , Ryusuke Konishi , Viacheslav Dubeyko , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Ilya Dryomov , Alex Markuze , Jan Harkes , coda@cs.cmu.edu, Nicolas Pitre , Tyler Hicks , Amir Goldstein , Christoph Hellwig , John Paul Adrian Glaubitz , Yangtao Li , Mikulas Patocka , David Woodhouse , Richard Weinberger , Dave Kleikamp , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , Mike Marshall , Martin Brandenburg , Miklos Szeredi , Anders Larsen , Zhihao Cheng , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Fan Wu , Stephen Smalley , Ondrej Mosnacek , Casey Schaufler , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S. Miller" , Jakub Kicinski , Simon Horman , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , "Darrick J. Wong" , Martin Schiller , Eric Paris , Joerg Reuter , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Oliver Hartkopp , Marc Kleine-Budde , David Ahern , Neal Cardwell , Steffen Klassert , Herbert Xu , Remi Denis-Courmont , Marcelo Ricardo Leitner , Xin Long , Magnus Karlsson , Maciej Fijalkowski , Stanislav Fomichev , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, nvdimm@lists.linux.dev, fsverity@lists.linux.dev, linux-mm@kvack.org, netfs@lists.linux.dev, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-nilfs@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, netdev@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-xfs@vger.kernel.org, linux-hams@vger.kernel.org, linux-x25@vger.kernel.org, audit@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-can@vger.kernel.org, linux-sctp@vger.kernel.org, bpf@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=26661; i=jlayton@kernel.org; h=from:subject:message-id; bh=mpnoRGuSw4SxSNPrcDcSDKeNXRSk3u7CSRiG/C+Xaqk=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBpqFCp3R7f0z3n5ksDE5hFJUJdGye36joy3Yf4I KsSBI7cCZCJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaahQqQAKCRAADmhBGVaC FS7CEADE2L+1fzD5iAXvQj9olGvcYBNB6aC1mGMz+YB8M2+4tmF1FglWesSDd4QNYRqzXiUlcSe fTFH0i+R4VhuSRY5aG4ezDeg+gUZaGVA5ZAclT9c2g31vH8OVlnca2oK3mfa6f1qEYVvRFHeix2 s9bXUI/CRFw2b7miopS5AYxwaQ9H3enGRFsT/f8hOfjaPl6emE67Q9+xl/f4xsw36RNjqmpbpIT TpjZH4fT7Q7ZzkmvVUyHOBTt71sRlCjiNVVQuYk206qWgx7egP2xEhxDrUp96ktO5KJzgXbIWly ujGMdeUV1WvcK7UpBcnN0VHfVS6BNAx7U2BeRpPXH2KH/Eq9cnwxutQBA9LuZKUkyHS3j9n9bM/ rY/0Q8EX8teTfCSLSyAWxpHXAcMZ0iNjQ0s5IRaXCD0gFD/rMwDzmU/bcj0UiFWkyzI82IdguGg b4mYyV0tNSRl0bhZKgHxTeCTrjnxeVtgzIUpoK89Bp6T7APZX/MYXje1CApSkFZ2ShHSnU7PHC+ 5G+9g00DAjFk7wgnjR4ATvKxmHBcyKxM6YQyZtSGVYVlJE0hRjPGr97ozjuruU2mpbpA1+dX9dD 1lSbYabLwNFEiTB13s30ShzVkg56FwhsnD+IeQMPHQ8BfBDlVE6/jmOJSQQegefiuQjTuxgTC61 Ri9HVxwcSBqZaFw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 In trace events, change __field(ino_t, ...) to __field(u64, ...) and update TP_printk format strings to %llu/%llx to match the widened field type. Signed-off-by: Jeff Layton --- include/trace/events/f2fs.h | 242 ++++++++++++++++++++++------------------= ---- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 9364e677556207ac041353a9eb2d5c2ee49b9dff..05a46908acd946cf7c016d99923= 403c04448c697 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -9,7 +9,7 @@ #include =20 #define show_dev(dev) MAJOR(dev), MINOR(dev) -#define show_dev_ino(entry) show_dev(entry->dev), (unsigned long)entry->ino +#define show_dev_ino(entry) show_dev(entry->dev), (unsigned long long)entr= y->ino =20 TRACE_DEFINE_ENUM(NODE); TRACE_DEFINE_ENUM(DATA); @@ -206,13 +206,13 @@ DECLARE_EVENT_CLASS(f2fs__inode, TP_ARGS(inode), =20 TP_STRUCT__entry( + __field(u64, ino) + __field(u64, pino) + __field(loff_t, size) + __field(blkcnt_t, blocks) __field(dev_t, dev) - __field(ino_t, ino) - __field(ino_t, pino) __field(umode_t, mode) - __field(loff_t, size) __field(unsigned int, nlink) - __field(blkcnt_t, blocks) __field(__u8, advise) ), =20 @@ -227,10 +227,10 @@ DECLARE_EVENT_CLASS(f2fs__inode, __entry->advise =3D F2FS_I(inode)->i_advise; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pino =3D %lu, i_mode =3D 0x%hx, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pino =3D %llu, i_mode =3D 0x%hx= , " "i_size =3D %lld, i_nlink =3D %u, i_blocks =3D %llu, i_advise =3D 0x%x", show_dev_ino(__entry), - (unsigned long)__entry->pino, + __entry->pino, __entry->mode, __entry->size, (unsigned int)__entry->nlink, @@ -245,8 +245,8 @@ DECLARE_EVENT_CLASS(f2fs__inode_exit, TP_ARGS(inode, ret), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(umode_t, mode) __field(int, ret) ), @@ -258,7 +258,7 @@ DECLARE_EVENT_CLASS(f2fs__inode_exit, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, type: %s, mode =3D 0%o, ret =3D = %d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, type: %s, mode =3D 0%o, ret =3D= %d", show_dev_ino(__entry), show_inode_type(__entry->mode & S_IFMT), __entry->mode & S_ALL_PERM, @@ -279,8 +279,8 @@ TRACE_EVENT(f2fs_sync_file_exit, TP_ARGS(inode, cp_reason, datasync, ret), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(int, cp_reason) __field(int, datasync) __field(int, ret) @@ -294,7 +294,7 @@ TRACE_EVENT(f2fs_sync_file_exit, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cp_reason: %s, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cp_reason: %s, " "datasync =3D %d, ret =3D %d", show_dev_ino(__entry), show_fsync_cpreason(__entry->cp_reason), @@ -361,10 +361,10 @@ TRACE_EVENT(f2fs_unlink_enter, TP_ARGS(dir, dentry), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, size) __field(blkcnt_t, blocks) + __field(dev_t, dev) __string(name, dentry->d_name.name) ), =20 @@ -376,7 +376,7 @@ TRACE_EVENT(f2fs_unlink_enter, __assign_str(name); ), =20 - TP_printk("dev =3D (%d,%d), dir ino =3D %lu, i_size =3D %lld, " + TP_printk("dev =3D (%d,%d), dir ino =3D %llu, i_size =3D %lld, " "i_blocks =3D %llu, name =3D %s", show_dev_ino(__entry), __entry->size, @@ -412,8 +412,8 @@ TRACE_EVENT(f2fs_truncate_data_blocks_range, TP_ARGS(inode, nid, ofs, free), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(nid_t, nid) __field(unsigned int, ofs) __field(int, free) @@ -427,7 +427,7 @@ TRACE_EVENT(f2fs_truncate_data_blocks_range, __entry->free =3D free; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, nid =3D %u, offset =3D %u, freed= =3D %d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, nid =3D %u, offset =3D %u, free= d =3D %d", show_dev_ino(__entry), (unsigned int)__entry->nid, __entry->ofs, @@ -441,11 +441,11 @@ DECLARE_EVENT_CLASS(f2fs__truncate_op, TP_ARGS(inode, from), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, size) __field(blkcnt_t, blocks) __field(u64, from) + __field(dev_t, dev) ), =20 TP_fast_assign( @@ -456,7 +456,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_op, __entry->from =3D from; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, i_size =3D %lld, i_blocks =3D %l= lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, i_size =3D %lld, i_blocks =3D %= llu, " "start file offset =3D %llu", show_dev_ino(__entry), __entry->size, @@ -499,8 +499,8 @@ DECLARE_EVENT_CLASS(f2fs__truncate_node, TP_ARGS(inode, nid, blk_addr), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(nid_t, nid) __field(block_t, blk_addr) ), @@ -512,7 +512,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_node, __entry->blk_addr =3D blk_addr; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, nid =3D %u, block_address =3D 0x= %llx", + TP_printk("dev =3D (%d,%d), ino =3D %llu, nid =3D %u, block_address =3D 0= x%llx", show_dev_ino(__entry), (unsigned int)__entry->nid, (unsigned long long)__entry->blk_addr) @@ -546,8 +546,8 @@ TRACE_EVENT(f2fs_truncate_partial_nodes, TP_ARGS(inode, nid, depth, err), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __array(nid_t, nid, 3) __field(int, depth) __field(int, err) @@ -563,7 +563,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes, __entry->err =3D err; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, " "nid[0] =3D %u, nid[1] =3D %u, nid[2] =3D %u, depth =3D %d, err =3D %d", show_dev_ino(__entry), (unsigned int)__entry->nid[0], @@ -581,11 +581,11 @@ TRACE_EVENT(f2fs_file_write_iter, TP_ARGS(inode, offset, length, ret), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, offset) __field(size_t, length) __field(ssize_t, ret) + __field(dev_t, dev) ), =20 TP_fast_assign( @@ -596,7 +596,7 @@ TRACE_EVENT(f2fs_file_write_iter, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, " "offset =3D %lld, length =3D %zu, written(err) =3D %zd", show_dev_ino(__entry), __entry->offset, @@ -611,11 +611,11 @@ TRACE_EVENT(f2fs_fadvise, TP_ARGS(inode, offset, len, advice), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, size) __field(loff_t, offset) __field(loff_t, len) + __field(dev_t, dev) __field(int, advice) ), =20 @@ -628,7 +628,7 @@ TRACE_EVENT(f2fs_fadvise, __entry->advice =3D advice; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, i_size =3D %lld offset:%llu, len= :%llu, advise:%d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, i_size =3D %lld offset:%llu, le= n:%llu, advise:%d", show_dev_ino(__entry), (unsigned long long)__entry->size, __entry->offset, @@ -643,8 +643,8 @@ TRACE_EVENT(f2fs_map_blocks, TP_ARGS(inode, map, flag, ret), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(block_t, m_lblk) __field(block_t, m_pblk) __field(unsigned int, m_len) @@ -670,7 +670,7 @@ TRACE_EVENT(f2fs_map_blocks, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, file offset =3D %llu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, file offset =3D %llu, " "start blkaddr =3D 0x%llx, len =3D 0x%llx, flags =3D %u, " "seg_type =3D %d, may_create =3D %d, multidevice =3D %d, " "flag =3D %d, err =3D %d", @@ -885,8 +885,8 @@ TRACE_EVENT(f2fs_lookup_start, TP_ARGS(dir, dentry, flags), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __string(name, dentry->d_name.name) __field(unsigned int, flags) ), @@ -898,7 +898,7 @@ TRACE_EVENT(f2fs_lookup_start, __entry->flags =3D flags; ), =20 - TP_printk("dev =3D (%d,%d), pino =3D %lu, name:%s, flags:%u", + TP_printk("dev =3D (%d,%d), pino =3D %llu, name:%s, flags:%u", show_dev_ino(__entry), __get_str(name), __entry->flags) @@ -912,8 +912,8 @@ TRACE_EVENT(f2fs_lookup_end, TP_ARGS(dir, dentry, ino, err), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __string(name, dentry->d_name.name) __field(nid_t, cino) __field(int, err) @@ -927,7 +927,7 @@ TRACE_EVENT(f2fs_lookup_end, __entry->err =3D err; ), =20 - TP_printk("dev =3D (%d,%d), pino =3D %lu, name:%s, ino:%u, err:%d", + TP_printk("dev =3D (%d,%d), pino =3D %llu, name:%s, ino:%u, err:%d", show_dev_ino(__entry), __get_str(name), __entry->cino, @@ -943,10 +943,10 @@ TRACE_EVENT(f2fs_rename_start, TP_ARGS(old_dir, old_dentry, new_dir, new_dentry, flags), =20 TP_STRUCT__entry( + __field(u64, ino) + __field(u64, new_pino) __field(dev_t, dev) - __field(ino_t, ino) __string(old_name, old_dentry->d_name.name) - __field(ino_t, new_pino) __string(new_name, new_dentry->d_name.name) __field(unsigned int, flags) ), @@ -960,8 +960,8 @@ TRACE_EVENT(f2fs_rename_start, __entry->flags =3D flags; ), =20 - TP_printk("dev =3D (%d,%d), old_dir =3D %lu, old_name: %s, " - "new_dir =3D %lu, new_name: %s, flags =3D %u", + TP_printk("dev =3D (%d,%d), old_dir =3D %llu, old_name: %s, " + "new_dir =3D %llu, new_name: %s, flags =3D %u", show_dev_ino(__entry), __get_str(old_name), __entry->new_pino, @@ -977,8 +977,8 @@ TRACE_EVENT(f2fs_rename_end, TP_ARGS(old_dentry, new_dentry, flags, ret), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __string(old_name, old_dentry->d_name.name) __string(new_name, new_dentry->d_name.name) __field(unsigned int, flags) @@ -994,7 +994,7 @@ TRACE_EVENT(f2fs_rename_end, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, old_name: %s, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, old_name: %s, " "new_name: %s, flags =3D %u, ret =3D %d", show_dev_ino(__entry), __get_str(old_name), @@ -1010,10 +1010,10 @@ TRACE_EVENT(f2fs_readdir, TP_ARGS(dir, start_pos, end_pos, err), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, start) __field(loff_t, end) + __field(dev_t, dev) __field(int, err) ), =20 @@ -1025,7 +1025,7 @@ TRACE_EVENT(f2fs_readdir, __entry->err =3D err; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, start_pos:%llu, end_pos:%llu, er= r:%d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, start_pos:%llu, end_pos:%llu, e= rr:%d", show_dev_ino(__entry), __entry->start, __entry->end, @@ -1040,13 +1040,13 @@ TRACE_EVENT(f2fs_fallocate, TP_ARGS(inode, mode, offset, len, ret), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) - __field(int, mode) + __field(u64, ino) __field(loff_t, offset) __field(loff_t, len) __field(loff_t, size) __field(blkcnt_t, blocks) + __field(dev_t, dev) + __field(int, mode) __field(int, ret) ), =20 @@ -1061,7 +1061,7 @@ TRACE_EVENT(f2fs_fallocate, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, mode =3D %x, offset =3D %lld, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, mode =3D %x, offset =3D %lld, " "len =3D %lld, i_size =3D %lld, i_blocks =3D %llu, ret =3D %d", show_dev_ino(__entry), __entry->mode, @@ -1079,12 +1079,12 @@ TRACE_EVENT(f2fs_direct_IO_enter, TP_ARGS(inode, iocb, len, rw), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, ki_pos) + __field(unsigned long, len) + __field(dev_t, dev) __field(int, ki_flags) __field(u16, ki_ioprio) - __field(unsigned long, len) __field(int, rw) ), =20 @@ -1098,7 +1098,7 @@ TRACE_EVENT(f2fs_direct_IO_enter, __entry->rw =3D rw; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu pos =3D %lld len =3D %lu ki_flags= =3D %x ki_ioprio =3D %x rw =3D %d", + TP_printk("dev =3D (%d,%d), ino =3D %llu pos =3D %lld len =3D %lu ki_flag= s =3D %x ki_ioprio =3D %x rw =3D %d", show_dev_ino(__entry), __entry->ki_pos, __entry->len, @@ -1115,10 +1115,10 @@ TRACE_EVENT(f2fs_direct_IO_exit, TP_ARGS(inode, offset, len, rw, ret), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, pos) __field(unsigned long, len) + __field(dev_t, dev) __field(int, rw) __field(int, ret) ), @@ -1132,7 +1132,7 @@ TRACE_EVENT(f2fs_direct_IO_exit, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu pos =3D %lld len =3D %lu " + TP_printk("dev =3D (%d,%d), ino =3D %llu pos =3D %lld len =3D %lu " "rw =3D %d ret =3D %d", show_dev_ino(__entry), __entry->pos, @@ -1176,9 +1176,9 @@ DECLARE_EVENT_CLASS(f2fs__submit_folio_bio, TP_ARGS(folio, fio), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, index) + __field(dev_t, dev) __field(block_t, old_blkaddr) __field(block_t, new_blkaddr) __field(enum req_op, op) @@ -1199,7 +1199,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_folio_bio, __entry->type =3D fio->type; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, folio_index =3D 0x%lx, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, folio_index =3D 0x%lx, " "oldaddr =3D 0x%llx, newaddr =3D 0x%llx, rw =3D %s(%s), type =3D %s_%s", show_dev_ino(__entry), (unsigned long)__entry->index, @@ -1306,9 +1306,9 @@ TRACE_EVENT(f2fs_write_begin, TP_ARGS(inode, pos, len), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, pos) + __field(dev_t, dev) __field(unsigned int, len) ), =20 @@ -1319,7 +1319,7 @@ TRACE_EVENT(f2fs_write_begin, __entry->len =3D len; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pos =3D %llu, len =3D %u", + TP_printk("dev =3D (%d,%d), ino =3D %llu, pos =3D %llu, len =3D %u", show_dev_ino(__entry), (unsigned long long)__entry->pos, __entry->len) @@ -1333,9 +1333,9 @@ TRACE_EVENT(f2fs_write_end, TP_ARGS(inode, pos, len, copied), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, pos) + __field(dev_t, dev) __field(unsigned int, len) __field(unsigned int, copied) ), @@ -1348,7 +1348,7 @@ TRACE_EVENT(f2fs_write_end, __entry->copied =3D copied; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pos =3D %llu, len =3D %u, copied= =3D %u", + TP_printk("dev =3D (%d,%d), ino =3D %llu, pos =3D %llu, len =3D %u, copie= d =3D %u", show_dev_ino(__entry), (unsigned long long)__entry->pos, __entry->len, @@ -1362,12 +1362,12 @@ DECLARE_EVENT_CLASS(f2fs__folio, TP_ARGS(folio, type), =20 TP_STRUCT__entry( + __field(u64, ino) + __field(pgoff_t, index) + __field(pgoff_t, nrpages) __field(dev_t, dev) - __field(ino_t, ino) __field(int, type) __field(int, dir) - __field(pgoff_t, index) - __field(pgoff_t, nrpages) __field(int, dirty) __field(int, uptodate) ), @@ -1383,7 +1383,7 @@ DECLARE_EVENT_CLASS(f2fs__folio, __entry->uptodate =3D folio_test_uptodate(folio); ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, %s, %s, index =3D %lu, nr_pages = =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, %s, %s, index =3D %lu, nr_pages= =3D %lu, " "dirty =3D %d, uptodate =3D %d", show_dev_ino(__entry), show_block_type(__entry->type), @@ -1437,10 +1437,10 @@ TRACE_EVENT(f2fs_replace_atomic_write_block, TP_ARGS(inode, cow_inode, index, old_addr, new_addr, recovery), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) - __field(ino_t, cow_ino) + __field(u64, ino) + __field(u64, cow_ino) __field(pgoff_t, index) + __field(dev_t, dev) __field(block_t, old_addr) __field(block_t, new_addr) __field(bool, recovery) @@ -1456,7 +1456,7 @@ TRACE_EVENT(f2fs_replace_atomic_write_block, __entry->recovery =3D recovery; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cow_ino =3D %lu, index =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cow_ino =3D %llu, index =3D %lu= , " "old_addr =3D 0x%llx, new_addr =3D 0x%llx, recovery =3D %d", show_dev_ino(__entry), __entry->cow_ino, @@ -1474,10 +1474,10 @@ DECLARE_EVENT_CLASS(f2fs_mmap, TP_ARGS(inode, index, flags, ret), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, index) __field(vm_flags_t, flags) + __field(dev_t, dev) __field(vm_fault_t, ret) ), =20 @@ -1489,7 +1489,7 @@ DECLARE_EVENT_CLASS(f2fs_mmap, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, index =3D %lu, flags: %s, ret: %= s", + TP_printk("dev =3D (%d,%d), ino =3D %llu, index =3D %lu, flags: %s, ret: = %s", show_dev_ino(__entry), (unsigned long)__entry->index, __print_flags(__entry->flags, "|", FAULT_FLAG_TRACE), @@ -1519,15 +1519,15 @@ TRACE_EVENT(f2fs_writepages, TP_ARGS(inode, wbc, type), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) - __field(int, type) - __field(int, dir) - __field(long, nr_to_write) - __field(long, pages_skipped) + __field(u64, ino) __field(loff_t, range_start) __field(loff_t, range_end) + __field(long, nr_to_write) + __field(long, pages_skipped) __field(pgoff_t, writeback_index) + __field(dev_t, dev) + __field(int, type) + __field(int, dir) __field(int, sync_mode) __field(char, for_kupdate) __field(char, for_background) @@ -1554,7 +1554,7 @@ TRACE_EVENT(f2fs_writepages, __entry->for_sync =3D wbc->for_sync; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, %s, %s, nr_to_write %ld, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, %s, %s, nr_to_write %ld, " "skipped %ld, start %lld, end %lld, wb_idx %lu, sync_mode %d, " "kupdate %u background %u tagged %u cyclic %u sync %u", show_dev_ino(__entry), @@ -1580,9 +1580,9 @@ TRACE_EVENT(f2fs_readpages, TP_ARGS(inode, start, nrpage), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, start) + __field(dev_t, dev) __field(unsigned int, nrpage) ), =20 @@ -1593,7 +1593,7 @@ TRACE_EVENT(f2fs_readpages, __entry->nrpage =3D nrpage; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, start =3D %lu nrpage =3D %u", + TP_printk("dev =3D (%d,%d), ino =3D %llu, start =3D %lu nrpage =3D %u", show_dev_ino(__entry), (unsigned long)__entry->start, __entry->nrpage) @@ -1738,8 +1738,8 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start, TP_ARGS(inode, pgofs, type), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(unsigned int, pgofs) __field(enum extent_type, type) ), @@ -1751,7 +1751,7 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start, __entry->type =3D type; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, type =3D %s", + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, type =3D %s", show_dev_ino(__entry), __entry->pgofs, show_extent_type(__entry->type)) @@ -1767,8 +1767,8 @@ TRACE_EVENT_CONDITION(f2fs_lookup_read_extent_tree_en= d, TP_CONDITION(ei), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(unsigned int, pgofs) __field(unsigned int, fofs) __field(unsigned int, len) @@ -1784,7 +1784,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_read_extent_tree_en= d, __entry->blk =3D ei->blk; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "read_ext_info(fofs: %u, len: %u, blk: %u)", show_dev_ino(__entry), __entry->pgofs, @@ -1803,13 +1803,13 @@ TRACE_EVENT_CONDITION(f2fs_lookup_age_extent_tree_e= nd, TP_CONDITION(ei), =20 TP_STRUCT__entry( + __field(u64, ino) + __field(unsigned long long, age) + __field(unsigned long long, blocks) __field(dev_t, dev) - __field(ino_t, ino) __field(unsigned int, pgofs) __field(unsigned int, fofs) __field(unsigned int, len) - __field(unsigned long long, age) - __field(unsigned long long, blocks) ), =20 TP_fast_assign( @@ -1822,7 +1822,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_age_extent_tree_end, __entry->blocks =3D ei->last_blocks; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "age_ext_info(fofs: %u, len: %u, age: %llu, blocks: %llu)", show_dev_ino(__entry), __entry->pgofs, @@ -1841,8 +1841,8 @@ TRACE_EVENT(f2fs_update_read_extent_tree_range, TP_ARGS(inode, pgofs, len, blkaddr, c_len), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(unsigned int, pgofs) __field(u32, blk) __field(unsigned int, len) @@ -1858,7 +1858,7 @@ TRACE_EVENT(f2fs_update_read_extent_tree_range, __entry->c_len =3D c_len; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "len =3D %u, blkaddr =3D %u, c_len =3D %u", show_dev_ino(__entry), __entry->pgofs, @@ -1876,12 +1876,12 @@ TRACE_EVENT(f2fs_update_age_extent_tree_range, TP_ARGS(inode, pgofs, len, age, last_blks), =20 TP_STRUCT__entry( + __field(u64, ino) + __field(unsigned long long, age) + __field(unsigned long long, blocks) __field(dev_t, dev) - __field(ino_t, ino) __field(unsigned int, pgofs) __field(unsigned int, len) - __field(unsigned long long, age) - __field(unsigned long long, blocks) ), =20 TP_fast_assign( @@ -1893,7 +1893,7 @@ TRACE_EVENT(f2fs_update_age_extent_tree_range, __entry->blocks =3D last_blks; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "len =3D %u, age =3D %llu, blocks =3D %llu", show_dev_ino(__entry), __entry->pgofs, @@ -1938,8 +1938,8 @@ TRACE_EVENT(f2fs_destroy_extent_tree, TP_ARGS(inode, node_cnt, type), =20 TP_STRUCT__entry( + __field(u64, ino) __field(dev_t, dev) - __field(ino_t, ino) __field(unsigned int, node_cnt) __field(enum extent_type, type) ), @@ -1951,7 +1951,7 @@ TRACE_EVENT(f2fs_destroy_extent_tree, __entry->type =3D type; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, destroyed: node_cnt =3D %u, type= =3D %s", + TP_printk("dev =3D (%d,%d), ino =3D %llu, destroyed: node_cnt =3D %u, typ= e =3D %s", show_dev_ino(__entry), __entry->node_cnt, show_extent_type(__entry->type)) @@ -2027,9 +2027,9 @@ DECLARE_EVENT_CLASS(f2fs_zip_start, TP_ARGS(inode, cluster_idx, cluster_size, algtype), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, idx) + __field(dev_t, dev) __field(unsigned int, size) __field(unsigned int, algtype) ), @@ -2042,7 +2042,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_start, __entry->algtype =3D algtype; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cluster_idx:%lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cluster_idx:%lu, " "cluster_size =3D %u, algorithm =3D %s", show_dev_ino(__entry), __entry->idx, @@ -2058,9 +2058,9 @@ DECLARE_EVENT_CLASS(f2fs_zip_end, TP_ARGS(inode, cluster_idx, compressed_size, ret), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, idx) + __field(dev_t, dev) __field(unsigned int, size) __field(unsigned int, ret) ), @@ -2073,7 +2073,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_end, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cluster_idx:%lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cluster_idx:%lu, " "compressed_size =3D %u, ret =3D %d", show_dev_ino(__entry), __entry->idx, @@ -2311,10 +2311,10 @@ TRACE_EVENT(f2fs_bmap, TP_ARGS(inode, lblock, pblock), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(sector_t, lblock) __field(sector_t, pblock) + __field(dev_t, dev) ), =20 TP_fast_assign( @@ -2324,7 +2324,7 @@ TRACE_EVENT(f2fs_bmap, __entry->pblock =3D pblock; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, lblock:%lld, pblock:%lld", + TP_printk("dev =3D (%d,%d), ino =3D %llu, lblock:%lld, pblock:%lld", show_dev_ino(__entry), (unsigned long long)__entry->lblock, (unsigned long long)__entry->pblock) @@ -2338,11 +2338,11 @@ TRACE_EVENT(f2fs_fiemap, TP_ARGS(inode, lblock, pblock, len, flags, ret), =20 TP_STRUCT__entry( - __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(sector_t, lblock) __field(sector_t, pblock) __field(unsigned long long, len) + __field(dev_t, dev) __field(unsigned int, flags) __field(int, ret) ), @@ -2357,7 +2357,7 @@ TRACE_EVENT(f2fs_fiemap, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, lblock:%lld, pblock:%lld, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, lblock:%lld, pblock:%lld, " "len:%llu, flags:%u, ret:%d", show_dev_ino(__entry), (unsigned long long)__entry->lblock, @@ -2375,13 +2375,13 @@ DECLARE_EVENT_CLASS(f2fs__rw_start, TP_ARGS(inode, offset, bytes, pid, pathname, command), =20 TP_STRUCT__entry( - __string(pathbuf, pathname) + __field(u64, ino) __field(loff_t, offset) - __field(int, bytes) __field(loff_t, i_size) + __string(pathbuf, pathname) __string(cmdline, command) __field(pid_t, pid) - __field(ino_t, ino) + __field(int, bytes) ), =20 TP_fast_assign( @@ -2402,10 +2402,10 @@ DECLARE_EVENT_CLASS(f2fs__rw_start, ), =20 TP_printk("entry_name %s, offset %llu, bytes %d, cmdline %s," - " pid %d, i_size %llu, ino %lu", + " pid %d, i_size %llu, ino %llu", __get_str(pathbuf), __entry->offset, __entry->bytes, __get_str(cmdline), __entry->pid, __entry->i_size, - (unsigned long) __entry->ino) + __entry->ino) ); =20 DECLARE_EVENT_CLASS(f2fs__rw_end, @@ -2415,7 +2415,7 @@ DECLARE_EVENT_CLASS(f2fs__rw_end, TP_ARGS(inode, offset, bytes), =20 TP_STRUCT__entry( - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, offset) __field(int, bytes) ), @@ -2426,8 +2426,8 @@ DECLARE_EVENT_CLASS(f2fs__rw_end, __entry->bytes =3D bytes; ), =20 - TP_printk("ino %lu, offset %llu, bytes %d", - (unsigned long) __entry->ino, + TP_printk("ino %llu, offset %llu, bytes %d", + __entry->ino, __entry->offset, __entry->bytes) ); =20 --=20 2.53.0