From nobody Tue Mar 3 05:07:00 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 CD8333CE49B; Mon, 2 Mar 2026 20:45:21 +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=1772484321; cv=none; b=NcmKzM0keTYPUvLmcwfzMy3xT3cVnjcJ/KMOq9siSd/SifbouoBMOS5xTw+PxVsvCqZ0dajn1KFyxaHWW4j3wGIIYSVIgEr7htwPulp9AJscKk0BEpUyDaEjHyVwzbbFk25iUKq5FcEbA9w+9/hZTdDJMw2QugOGn7R4m5Y8z4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772484321; c=relaxed/simple; bh=hXZa7KMq0thqNyf3M2ptoW/dddwHvltqq9Ic1Sx2+m4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mbo8VToGRHg1r8mqDTb+n3oiNoyzoubHnaTNeIWdNxMCGioDZd5/FVunOcs/t6II2Z2MgXErSm9tQSNy5c0pEvCVGemil2XHgEOZRwVKKe9jz2den5RpKMEdgRrE8ylyzpJQMwXj87FACQGHr8Vu+i8o5ToR1yIw47tDXRnlQKw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pcG9rlTn; 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="pcG9rlTn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A5BFC19423; Mon, 2 Mar 2026 20:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772484321; bh=hXZa7KMq0thqNyf3M2ptoW/dddwHvltqq9Ic1Sx2+m4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pcG9rlTnEqBa4+qhvGpZ9dgf1tP86eL/AQxOFeaV48xtNdFjK6DO691QO4GdUUWx6 rhtzufD0On501TB1/TqgED73jZgl6cinyiFDSXjV1j/KiqBZ8WQaybUyLo5j7EW8wK AQmjfdhk4/it2n9DU50WJQcunG/RV4aqE5UlXG5lEnWrWCCCMUF2WFg1rVp3ZJxrWh qwWoUajgEAuE8Jcm83RHVW6od8cFFapYlaDRHBiW/U0zDpQ24//yGxE0FYy5fnrYei YonE1g93IxukqssEdeX8PpUWwDwvJVEmwBnHYoRhAwmCbLT91cVrg4Op47V31jGeBP dP/NemM98K3xA== From: Jeff Layton Date: Mon, 02 Mar 2026 15:25:09 -0500 Subject: [PATCH v2 085/110] hfsplus: replace PRIino with %llu/%llx format strings 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: <20260302-iino-u64-v2-85-e5388800dae0@kernel.org> References: <20260302-iino-u64-v2-0-e5388800dae0@kernel.org> In-Reply-To: <20260302-iino-u64-v2-0-e5388800dae0@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Dan Williams , Matthew Wilcox , 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=9695; i=jlayton@kernel.org; h=from:subject:message-id; bh=hXZa7KMq0thqNyf3M2ptoW/dddwHvltqq9Ic1Sx2+m4=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBppfIGI6mtXlw4jltNkiZO3yOQTAZCguLk6KmrG aLE4661BuWJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaXyBgAKCRAADmhBGVaC FbzkD/9mMMSqjUxSShVq5p+gmO4O0xxbgB/rm1XXmGLb85uUh7io3vVAKAv0tvOy8n+KZFj6ABn pBdo2DCgqxdlefyAA8IRaID/zK8evjcLGNjfvkWy2n8lHsqebSE5r3Wrgk1FaCmUi691r6fZBHi txOOs0A+NH+NVxCq6q+i0j2VkbErfh1ok83PjSZf115YzWgZ5aM96+MrQnunRMIyhgMdS69Qi22 yDMhToXagfPir17CCUFDLJC71uSruJGPxh/gQFfW3rOODLJO4a5S6JCO8AMjP29BCM8g4qGDgwE B7KBeV6PJlqB9xsksXoloWcb8HEuNICacscC/yEcjAKjaAYVj4mKmoNemYOeN1TTo6enqNxV5Zh ij8j7Zyr6uvxYFqn5ZO/clL3Vl095OzH4gUAPxo83nilYLvscWCd+fo174Q2jCMGkzQKDKLmD9D uaDLXFIF1zVB/HeH17woowdt0DVJbU38mwrsjciAJ9nxjHEU/w6XEuHcnOPVL7PrL9WxoyMjXyq L0hVjLOhxRRv5DGbe6bGT4CzdVkDG7IqQAWlN1/G+48r1vSJeU0CnSFUgSKKpNjU6BjSQMRNsBJ pE0sLA8LAQe+BsrMOF8A3ddLa/2rh1ImGZSonPuvL2j8Ia3GAYwMpB8AqTnTsc6qPriWWpvcJNQ GNagc/MtRR9bIZg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Now that i_ino is u64 and the PRIino format macro has been removed, replace all uses in hfsplus with the concrete format strings. Signed-off-by: Jeff Layton --- fs/hfsplus/attributes.c | 10 +++++----- fs/hfsplus/catalog.c | 2 +- fs/hfsplus/dir.c | 6 +++--- fs/hfsplus/extents.c | 6 +++--- fs/hfsplus/inode.c | 8 ++++---- fs/hfsplus/super.c | 6 +++--- fs/hfsplus/xattr.c | 10 +++++----- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fs/hfsplus/attributes.c b/fs/hfsplus/attributes.c index d0b3f58166a057c0a5bf2e41cf6fc839798c0ded..174cd13106ad66008a120e3e709= 84be7cb42a65f 100644 --- a/fs/hfsplus/attributes.c +++ b/fs/hfsplus/attributes.c @@ -203,7 +203,7 @@ int hfsplus_create_attr_nolock(struct inode *inode, con= st char *name, int entry_size; int err; =20 - hfs_dbg("name %s, ino %" PRIino "u\n", + hfs_dbg("name %s, ino %llu\n", name ? name : NULL, inode->i_ino); =20 if (name) { @@ -255,7 +255,7 @@ int hfsplus_create_attr(struct inode *inode, hfsplus_attr_entry *entry_ptr; int err; =20 - hfs_dbg("name %s, ino %" PRIino "u\n", + hfs_dbg("name %s, ino %llu\n", name ? name : NULL, inode->i_ino); =20 if (!HFSPLUS_SB(sb)->attr_tree) { @@ -337,7 +337,7 @@ int hfsplus_delete_attr_nolock(struct inode *inode, con= st char *name, struct super_block *sb =3D inode->i_sb; int err; =20 - hfs_dbg("name %s, ino %" PRIino "u\n", + hfs_dbg("name %s, ino %llu\n", name ? name : NULL, inode->i_ino); =20 if (name) { @@ -367,7 +367,7 @@ int hfsplus_delete_attr(struct inode *inode, const char= *name) struct super_block *sb =3D inode->i_sb; struct hfs_find_data fd; =20 - hfs_dbg("name %s, ino %" PRIino "u\n", + hfs_dbg("name %s, ino %llu\n", name ? name : NULL, inode->i_ino); =20 if (!HFSPLUS_SB(sb)->attr_tree) { @@ -436,7 +436,7 @@ int hfsplus_replace_attr(struct inode *inode, hfsplus_attr_entry *entry_ptr; int err =3D 0; =20 - hfs_dbg("name %s, ino %" PRIino "u\n", + hfs_dbg("name %s, ino %llu\n", name ? name : NULL, inode->i_ino); =20 if (!HFSPLUS_SB(sb)->attr_tree) { diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c index d422f117c60dee6fd8ece0d01d4ce66e04421e4a..0e961e99b9856ab7d95da5d070b= 4fbce1e67ebde 100644 --- a/fs/hfsplus/catalog.c +++ b/fs/hfsplus/catalog.c @@ -441,7 +441,7 @@ int hfsplus_rename_cat(u32 cnid, int entry_size, type; int err; =20 - hfs_dbg("cnid %u - ino %" PRIino "u, name %s - ino %" PRIino "u, name %s\= n", + hfs_dbg("cnid %u - ino %llu, name %s - ino %llu, name %s\n", cnid, src_dir->i_ino, src_name->name, dst_dir->i_ino, dst_name->name); err =3D hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &src_fd); diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index e701b11437f09172f88d68b4e4f5998591572b38..054f6da46033404bbbcf299beb5= d8765495c0de3 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -313,7 +313,7 @@ static int hfsplus_link(struct dentry *src_dentry, stru= ct inode *dst_dir, if (!S_ISREG(inode->i_mode)) return -EPERM; =20 - hfs_dbg("src_dir->i_ino %" PRIino "u, dst_dir->i_ino %" PRIino "u, inode-= >i_ino %" PRIino "u\n", + hfs_dbg("src_dir->i_ino %llu, dst_dir->i_ino %llu, inode->i_ino %llu\n", src_dir->i_ino, dst_dir->i_ino, inode->i_ino); =20 mutex_lock(&sbi->vh_mutex); @@ -385,7 +385,7 @@ static int hfsplus_unlink(struct inode *dir, struct den= try *dentry) if (HFSPLUS_IS_RSRC(inode)) return -EPERM; =20 - hfs_dbg("dir->i_ino %" PRIino "u, inode->i_ino %" PRIino "u\n", + hfs_dbg("dir->i_ino %llu, inode->i_ino %llu\n", dir->i_ino, inode->i_ino); =20 mutex_lock(&sbi->vh_mutex); @@ -393,7 +393,7 @@ static int hfsplus_unlink(struct inode *dir, struct den= try *dentry) if (inode->i_ino =3D=3D cnid && atomic_read(&HFSPLUS_I(inode)->opencnt)) { str.name =3D name; - str.len =3D sprintf(name, "temp%" PRIino "u", inode->i_ino); + str.len =3D sprintf(name, "temp%llu", inode->i_ino); res =3D hfsplus_rename_cat(inode->i_ino, dir, &dentry->d_name, sbi->hidden_dir, &str); diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c index 1dbfdf44f954f2768852678d1e386a91758848f9..474fde1a1653be6cf74b26e757c= 6d8a6f8d2906a 100644 --- a/fs/hfsplus/extents.c +++ b/fs/hfsplus/extents.c @@ -275,7 +275,7 @@ int hfsplus_get_block(struct inode *inode, sector_t ibl= ock, mutex_unlock(&hip->extents_lock); =20 done: - hfs_dbg("ino %" PRIino "u, iblock %llu - dblock %u\n", + hfs_dbg("ino %llu, iblock %llu - dblock %u\n", inode->i_ino, (long long)iblock, dblock); =20 mask =3D (1 << sbi->fs_shift) - 1; @@ -476,7 +476,7 @@ int hfsplus_file_extend(struct inode *inode, bool zeroo= ut) goto out; } =20 - hfs_dbg("ino %" PRIino "u, start %u, len %u\n", inode->i_ino, start, len); + hfs_dbg("ino %llu, start %u, len %u\n", inode->i_ino, start, len); =20 if (hip->alloc_blocks <=3D hip->first_blocks) { if (!hip->first_blocks) { @@ -545,7 +545,7 @@ void hfsplus_file_truncate(struct inode *inode) u32 alloc_cnt, blk_cnt, start; int res; =20 - hfs_dbg("ino %" PRIino "u, phys_size %llu -> i_size %llu\n", + hfs_dbg("ino %llu, phys_size %llu -> i_size %llu\n", inode->i_ino, (long long)hip->phys_size, inode->i_size); =20 if (inode->i_size > hip->phys_size) { diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index f61397db976e8b15fa186c3b31af71e55f9e26a6..02be32dc6833dfdd767c407ec02= 63485d1a2c3c6 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -230,7 +230,7 @@ static int hfsplus_get_perms(struct inode *inode, inode->i_flags &=3D ~S_APPEND; return 0; bad_type: - pr_err("invalid file type 0%04o for inode %" PRIino "u\n", mode, inode->i= _ino); + pr_err("invalid file type 0%04o for inode %llu\n", mode, inode->i_ino); return -EIO; } =20 @@ -328,7 +328,7 @@ int hfsplus_file_fsync(struct file *file, loff_t start,= loff_t end, struct hfsplus_vh *vhdr =3D sbi->s_vhdr; int error =3D 0, error2; =20 - hfs_dbg("inode->i_ino %" PRIino "u, start %llu, end %llu\n", + hfs_dbg("inode->i_ino %llu, start %llu, end %llu\n", inode->i_ino, start, end); =20 error =3D file_write_and_wait_range(file, start, end); @@ -639,7 +639,7 @@ int hfsplus_cat_write_inode(struct inode *inode) hfsplus_cat_entry entry; int res =3D 0; =20 - hfs_dbg("inode->i_ino %" PRIino "u\n", inode->i_ino); + hfs_dbg("inode->i_ino %llu\n", inode->i_ino); =20 if (HFSPLUS_IS_RSRC(inode)) main_inode =3D HFSPLUS_I(inode)->rsrc_inode; @@ -716,7 +716,7 @@ int hfsplus_cat_write_inode(struct inode *inode) if (!res) { res =3D hfs_btree_write(tree); if (res) { - pr_err("b-tree write err: %d, ino %" PRIino "u\n", + pr_err("b-tree write err: %d, ino %llu\n", res, inode->i_ino); } } diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index b76865e2eac5260b681fc46b297f1665f1bc10da..b3917249c206c3a25fe98b39a5e= b2168b7404dc2 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c @@ -156,7 +156,7 @@ static int hfsplus_system_write_inode(struct inode *ino= de) int err =3D hfs_btree_write(tree); =20 if (err) { - pr_err("b-tree write err: %d, ino %" PRIino "u\n", + pr_err("b-tree write err: %d, ino %llu\n", err, inode->i_ino); return err; } @@ -169,7 +169,7 @@ static int hfsplus_write_inode(struct inode *inode, { int err; =20 - hfs_dbg("ino %" PRIino "u\n", inode->i_ino); + hfs_dbg("ino %llu\n", inode->i_ino); =20 err =3D hfsplus_ext_write_extent(inode); if (err) @@ -184,7 +184,7 @@ static int hfsplus_write_inode(struct inode *inode, =20 static void hfsplus_evict_inode(struct inode *inode) { - hfs_dbg("ino %" PRIino "u\n", inode->i_ino); + hfs_dbg("ino %llu\n", inode->i_ino); truncate_inode_pages_final(&inode->i_data); clear_inode(inode); if (HFSPLUS_IS_RSRC(inode)) { diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c index ef9121843482e81961fa541c53c906ab04d6fc33..c70bb6f494b22b1e3f74e18a9ef= 378e0c87f8194 100644 --- a/fs/hfsplus/xattr.c +++ b/fs/hfsplus/xattr.c @@ -277,7 +277,7 @@ int __hfsplus_setxattr(struct inode *inode, const char = *name, u16 folder_finderinfo_len =3D sizeof(DInfo) + sizeof(DXInfo); u16 file_finderinfo_len =3D sizeof(FInfo) + sizeof(FXInfo); =20 - hfs_dbg("ino %" PRIino "u, name %s, value %p, size %zu\n", + hfs_dbg("ino %llu, name %s, value %p, size %zu\n", inode->i_ino, name ? name : NULL, value, size); =20 @@ -447,7 +447,7 @@ int hfsplus_setxattr(struct inode *inode, const char *n= ame, NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1; int res; =20 - hfs_dbg("ino %" PRIino "u, name %s, prefix %s, prefixlen %zu, " + hfs_dbg("ino %llu, name %s, prefix %s, prefixlen %zu, " "value %p, size %zu\n", inode->i_ino, name ? name : NULL, prefix ? prefix : NULL, prefixlen, @@ -607,7 +607,7 @@ ssize_t hfsplus_getxattr(struct inode *inode, const cha= r *name, int res; char *xattr_name; =20 - hfs_dbg("ino %" PRIino "u, name %s, prefix %s\n", + hfs_dbg("ino %llu, name %s, prefix %s\n", inode->i_ino, name ? name : NULL, prefix ? prefix : NULL); =20 @@ -717,7 +717,7 @@ ssize_t hfsplus_listxattr(struct dentry *dentry, char *= buffer, size_t size) size_t strbuf_size; int xattr_name_len; =20 - hfs_dbg("ino %" PRIino "u\n", inode->i_ino); + hfs_dbg("ino %llu\n", inode->i_ino); =20 if (!is_xattr_operation_supported(inode)) return -EOPNOTSUPP; @@ -819,7 +819,7 @@ static int hfsplus_removexattr(struct inode *inode, con= st char *name) int is_xattr_acl_deleted; int is_all_xattrs_deleted; =20 - hfs_dbg("ino %" PRIino "u, name %s\n", + hfs_dbg("ino %llu, name %s\n", inode->i_ino, name ? name : NULL); =20 if (!HFSPLUS_SB(inode->i_sb)->attr_tree) --=20 2.53.0