From nobody Tue Mar 3 05:07:06 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 5C668388E54; Mon, 2 Mar 2026 20:34:36 +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=1772483676; cv=none; b=TAx0tUosPWozvhhL/SlCVdLqk8+l4dF6CX99RHu/EQwj6nhTfeA9Lj2VQfv4ojvxuIsF4oJxImN/UdM8Ha5rJZpbKCU/ur8g3oMxWt1ewPKIQQ+eev/Ieea3i+4uVfb/Pbcn2N1swXV3nns+Fnq6fZNS3zVzhuvflCnQNHmD3+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772483676; c=relaxed/simple; bh=zDOfQu3cch1u1Ngb97bS3zzdl0dgOjMk0bBEwc1nc/8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MZzYaVg1rC65JZ+sGG7Y+JBtnpLoguwe4yZaF7VJn2lufW+zJ1AuwTh4cbvPmxXRrlJYgtfzZ9bwmapEJn56etjXbBmuoNq2Q3+TAH9X1SwjJhlXi99CSlerNi5SGQ9TrwG3MJybC3fZzeuMPuhW4O9oCITQlW5xfPZmtaq3Uz4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dugwQL0r; 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="dugwQL0r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9153C2BCB3; Mon, 2 Mar 2026 20:34:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772483676; bh=zDOfQu3cch1u1Ngb97bS3zzdl0dgOjMk0bBEwc1nc/8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dugwQL0rTQlo0eqDRzSj4bYCAaBkPTXwufIqepq8L90QxEZs131C8UyeZwQkXNV5w Lsk4QdjxCSTp8kwzxRwVjy2QkvT4nom7g3raD5B/rkXq2DpuY/wMATjLDt9fRLqVTc UtpvEt96O1ADdKNw2IppMzkDUg/eisPOIVPYCYsPxy7r0hrIIQyytgyk1BZDLCz5Pe g/JLxWm1VRV7z/75H9nFzdMmu50H0lDEU8fuF3/3lIJOSXOB4X+zZVv3mXp/sNRpJi NvajzXzASpyuyjaCxWYTXFpgLHERczrlNtRBRyrDg1mcKFrZprGTcncFL49eXanKVQ qF/pw/twmcmoA== From: Jeff Layton Date: Mon, 02 Mar 2026 15:24:24 -0500 Subject: [PATCH v2 040/110] ocfs2: use PRIino format for i_ino 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-40-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=12707; i=jlayton@kernel.org; h=from:subject:message-id; bh=zDOfQu3cch1u1Ngb97bS3zzdl0dgOjMk0bBEwc1nc/8=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBppfH5TH81MLXzhYX9ei+5zmHkw2gJXRYBhwKEr Jw8vSwrFu6JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaXx+QAKCRAADmhBGVaC FWlGD/9G0B+TKkI8uy3/96mmUDo5WHDJCLonyJTn0kWyjP9i0eBajXAHt1oQL6Lw129hT0PB6xk 4mdougx7mf/BE6XmUcqAx+uzskgptUnDaYSdftObugoUd+kw6PGxHR8HUdRXN8Fa6MVw85JgFZ7 9ZOL9MqZhJcGXjUn/11WT/w2cLSpf31tBHS+zRaNdNlRjYwdu/qG4Eywt66YnnFasE2NU8EXFuI hGY+DT21F3nA99M1IUicDc9WS7tPFk2HFtDlviD6+AQWJnOCbr5x7vAxoxCdJPMUvHNHIChjGMN 0zfQrLVLz/eBQvCIOoaH1f8ob9UQakCQXZ0hTd1Wz9iDByUkzxz6RnSc7lLhr5d1fgnEvVjRVYq 2wLlq+YN4Fqhad3LrKtFIODaGIvpvzg13GB6wKejwN4G3gj7hewX4vcwspbWO88vQujvwl8jpHm D2n4fsox9PfGt09vUTu5++IhlvfkM8jBlh1Y9tS+QN2gC4WWLnoMwut/ONLYDLjDZzCQmIAj1MH fj8wQbQQWXZqLXLEQoxRzjuoSWcVGZVCAN1FC9o1xTlUbcdgpWHjPoFc4lYw5VDlclxQ5rEvatn aeKm7ipPYT/7vBaPyMs9AVwWrP24kooYoy2NWKb7x0YC0ccAwKc7xOnPq6XbBrfCYv43dOcA6Fx R1s8v/5yER4ThmQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Convert ocfs2 i_ino format strings to use the PRIino format macro in preparation for the widening of i_ino via kino_t. Remove now-unnecessary (unsigned long) casts on i_ino. Signed-off-by: Jeff Layton --- fs/ocfs2/alloc.c | 2 +- fs/ocfs2/aops.c | 4 ++-- fs/ocfs2/dir.c | 8 ++++---- fs/ocfs2/dlmfs/dlmfs.c | 10 +++++----- fs/ocfs2/extent_map.c | 12 ++++++------ fs/ocfs2/inode.c | 2 +- fs/ocfs2/quota_local.c | 2 +- fs/ocfs2/refcounttree.c | 10 +++++----- fs/ocfs2/xattr.c | 4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 344fd4d95fbc8bd7a749e9d51d31b5682ff030d0..d7703549645b548d9f5d77b2214= a9a7c0af0ef6f 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -7318,7 +7318,7 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, * to check it up here before changing the tree. */ if (root_el->l_tree_depth && rec->e_int_clusters =3D=3D 0) { - mlog(ML_ERROR, "Inode %lu has an empty " + mlog(ML_ERROR, "Inode %" PRIino "u has an empty " "extent record, depth %u\n", inode->i_ino, le16_to_cpu(root_el->l_tree_depth)); status =3D ocfs2_remove_rightmost_empty_extent(osb, diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 17ba79f443ee736cb5225702c57d13f4019f3c52..aea35b1c9fa3ce7327672c1862d= 0d1201c895c40 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -137,7 +137,7 @@ int ocfs2_get_block(struct inode *inode, sector_t ibloc= k, (unsigned long long)iblock, bh_result, create); =20 if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE) - mlog(ML_NOTICE, "get_block on system inode 0x%p (%lu)\n", + mlog(ML_NOTICE, "get_block on system inode 0x%p (%" PRIino "u)\n", inode, inode->i_ino); =20 if (S_ISLNK(inode->i_mode)) { @@ -2146,7 +2146,7 @@ static int ocfs2_dio_wr_get_block(struct inode *inode= , sector_t iblock, ((iblock + ((len - 1) >> i_blkbits)) > endblk)) len =3D (endblk - iblock + 1) << i_blkbits; =20 - mlog(0, "get block of %lu at %llu:%u req %u\n", + mlog(0, "get block of %" PRIino "u at %llu:%u req %u\n", inode->i_ino, pos, len, total_len); =20 /* diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 1c8abf2c592caacbe734d49254b04d507925c9d1..eecb2b1d2ec17fb4b3f09abb9e1= 68d2f28f9b420 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -794,7 +794,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, if (le16_to_cpu(el->l_count) !=3D ocfs2_extent_recs_per_dx_root(inode->i_sb)) { ret =3D ocfs2_error(inode->i_sb, - "Inode %lu has invalid extent list length %u\n", + "Inode %" PRIino "u has invalid extent list length %u\n", inode->i_ino, le16_to_cpu(el->l_count)); goto out; } @@ -812,7 +812,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, =20 if (el->l_tree_depth) { ret =3D ocfs2_error(inode->i_sb, - "Inode %lu has non zero tree depth in btree tree block %llu\n", + "Inode %" PRIino "u has non zero tree depth in btree tree block %ll= u\n", inode->i_ino, (unsigned long long)eb_bh->b_blocknr); goto out; @@ -821,7 +821,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, =20 if (le16_to_cpu(el->l_next_free_rec) =3D=3D 0) { ret =3D ocfs2_error(inode->i_sb, - "Inode %lu has empty extent list at depth %u\n", + "Inode %" PRIino "u has empty extent list at depth %u\n", inode->i_ino, le16_to_cpu(el->l_tree_depth)); goto out; @@ -839,7 +839,7 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, =20 if (!found) { ret =3D ocfs2_error(inode->i_sb, - "Inode %lu has bad extent record (%u, %u, 0) in btree\n", + "Inode %" PRIino "u has bad extent record (%u, %u, 0) in btree\n", inode->i_ino, le32_to_cpu(rec->e_cpos), ocfs2_rec_clusters(el, rec)); diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index 45cce261da65cab7ef48b5b88c0de5d41fa57615..e96c1c574ff7dc3dffad58ce853= 6b7e337d3f6fa 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c @@ -123,7 +123,7 @@ static int dlmfs_file_open(struct inode *inode, if (S_ISDIR(inode->i_mode)) BUG(); =20 - mlog(0, "open called on inode %lu, flags 0x%x\n", inode->i_ino, + mlog(0, "open called on inode %" PRIino "u, flags 0x%x\n", inode->i_ino, file->f_flags); =20 status =3D dlmfs_decode_open_flags(file->f_flags, &level, &flags); @@ -170,7 +170,7 @@ static int dlmfs_file_release(struct inode *inode, if (S_ISDIR(inode->i_mode)) BUG(); =20 - mlog(0, "close called on inode %lu\n", inode->i_ino); + mlog(0, "close called on inode %" PRIino "u\n", inode->i_ino); =20 if (fp) { level =3D fp->fp_lock_level; @@ -242,7 +242,7 @@ static ssize_t dlmfs_file_write(struct file *filp, int bytes_left; struct inode *inode =3D file_inode(filp); =20 - mlog(0, "inode %lu, count =3D %zu, *ppos =3D %llu\n", + mlog(0, "inode %" PRIino "u, count =3D %zu, *ppos =3D %llu\n", inode->i_ino, count, *ppos); =20 if (*ppos >=3D DLM_LVB_LEN) @@ -301,7 +301,7 @@ static void dlmfs_evict_inode(struct inode *inode) =20 clear_inode(inode); =20 - mlog(0, "inode %lu\n", inode->i_ino); + mlog(0, "inode %" PRIino "u\n", inode->i_ino); =20 ip =3D DLMFS_I(inode); lockres =3D &ip->ip_lockres; @@ -490,7 +490,7 @@ static int dlmfs_unlink(struct inode *dir, int status; struct inode *inode =3D d_inode(dentry); =20 - mlog(0, "unlink inode %lu\n", inode->i_ino); + mlog(0, "unlink inode %" PRIino "u\n", inode->i_ino); =20 /* if there are no current holders, or none that are waiting * to acquire a lock, this basically destroys our lockres. */ diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index d68229422dda3423971d7ab0e9a4335acab8b344..3cf93a08f7a8946810ccd2de246= be4d07a23b53b 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c @@ -291,7 +291,7 @@ static int ocfs2_last_eb_is_empty(struct inode *inode, =20 if (el->l_tree_depth) { ocfs2_error(inode->i_sb, - "Inode %lu has non zero tree depth in leaf block %llu\n", + "Inode %" PRIino "u has non zero tree depth in leaf block %llu\n", inode->i_ino, (unsigned long long)eb_bh->b_blocknr); ret =3D -EROFS; @@ -427,7 +427,7 @@ static int ocfs2_get_clusters_nocache(struct inode *ino= de, =20 if (el->l_tree_depth) { ocfs2_error(inode->i_sb, - "Inode %lu has non zero tree depth in leaf block %llu\n", + "Inode %" PRIino "u has non zero tree depth in leaf block %llu\n", inode->i_ino, (unsigned long long)eb_bh->b_blocknr); ret =3D -EROFS; @@ -437,7 +437,7 @@ static int ocfs2_get_clusters_nocache(struct inode *ino= de, =20 if (le16_to_cpu(el->l_next_free_rec) > le16_to_cpu(el->l_count)) { ocfs2_error(inode->i_sb, - "Inode %lu has an invalid extent (next_free_rec %u, count %u)\n", + "Inode %" PRIino "u has an invalid extent (next_free_rec %u, count = %u)\n", inode->i_ino, le16_to_cpu(el->l_next_free_rec), le16_to_cpu(el->l_count)); @@ -472,7 +472,7 @@ static int ocfs2_get_clusters_nocache(struct inode *ino= de, =20 if (!rec->e_blkno) { ocfs2_error(inode->i_sb, - "Inode %lu has bad extent record (%u, %u, 0)\n", + "Inode %" PRIino "u has bad extent record (%u, %u, 0)\n", inode->i_ino, le32_to_cpu(rec->e_cpos), ocfs2_rec_clusters(el, rec)); @@ -561,7 +561,7 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v= _cluster, =20 if (el->l_tree_depth) { ocfs2_error(inode->i_sb, - "Inode %lu has non zero tree depth in xattr leaf block %llu\n", + "Inode %" PRIino "u has non zero tree depth in xattr leaf block %l= lu\n", inode->i_ino, (unsigned long long)eb_bh->b_blocknr); ret =3D -EROFS; @@ -580,7 +580,7 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v= _cluster, =20 if (!rec->e_blkno) { ocfs2_error(inode->i_sb, - "Inode %lu has bad extent record (%u, %u, 0) in xattr\n", + "Inode %" PRIino "u has bad extent record (%u, %u, 0) in xattr\n", inode->i_ino, le32_to_cpu(rec->e_cpos), ocfs2_rec_clusters(el, rec)); diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 03a51662ea8e79f7a64fcd320b974f954b2ea8bf..c3076b450de3599291c386ceeb8= b2d26e8680904 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -1196,7 +1196,7 @@ static void ocfs2_clear_inode(struct inode *inode) inode->i_nlink); =20 mlog_bug_on_msg(osb =3D=3D NULL, - "Inode=3D%lu\n", inode->i_ino); + "Inode=3D%" PRIino "u\n", inode->i_ino); =20 dquot_drop(inode); =20 diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index c4e0117d8977807dd6f0f4df64e1ddf72a62ea09..269b0f27d5679aba317059b245e= e4bf4f5580eca 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c @@ -471,7 +471,7 @@ static int ocfs2_recover_local_quota_file(struct inode = *lqinode, qsize_t spacechange, inodechange; unsigned int memalloc; =20 - trace_ocfs2_recover_local_quota_file((unsigned long)lqinode->i_ino, type); + trace_ocfs2_recover_local_quota_file(lqinode->i_ino, type); =20 list_for_each_entry_safe(rchunk, next, &(rec->r_list[type]), rc_list) { chunk =3D rchunk->rc_chunk; diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index c1cdececdfa4ef51a1bd3a5addad734b324b92c0..1586c42fdabe70056bf7f103d58= 3dd9000fe9510 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -2341,7 +2341,7 @@ static int ocfs2_mark_extent_refcounted(struct inode = *inode, cpos, len, phys); =20 if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) { - ret =3D ocfs2_error(inode->i_sb, "Inode %lu want to use refcount tree, b= ut the feature bit is not set in the super block\n", + ret =3D ocfs2_error(inode->i_sb, "Inode %" PRIino "u want to use refcoun= t tree, but the feature bit is not set in the super block\n", inode->i_ino); goto out; } @@ -2524,7 +2524,7 @@ int ocfs2_prepare_refcount_change_for_del(struct inod= e *inode, u64 start_cpos =3D ocfs2_blocks_to_clusters(inode->i_sb, phys_blkno); =20 if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) { - ret =3D ocfs2_error(inode->i_sb, "Inode %lu want to use refcount tree, b= ut the feature bit is not set in the super block\n", + ret =3D ocfs2_error(inode->i_sb, "Inode %" PRIino "u want to use refcoun= t tree, but the feature bit is not set in the super block\n", inode->i_ino); goto out; } @@ -2650,7 +2650,7 @@ static int ocfs2_refcount_cal_cow_clusters(struct ino= de *inode, =20 if (el->l_tree_depth) { ret =3D ocfs2_error(inode->i_sb, - "Inode %lu has non zero tree depth in leaf block %llu\n", + "Inode %" PRIino "u has non zero tree depth in leaf block %llu\n", inode->i_ino, (unsigned long long)eb_bh->b_blocknr); goto out; @@ -2662,7 +2662,7 @@ static int ocfs2_refcount_cal_cow_clusters(struct ino= de *inode, rec =3D &el->l_recs[i]; =20 if (ocfs2_is_empty_extent(rec)) { - mlog_bug_on_msg(i !=3D 0, "Inode %lu has empty record in " + mlog_bug_on_msg(i !=3D 0, "Inode %" PRIino "u has empty record in " "index %d\n", inode->i_ino, i); continue; } @@ -3325,7 +3325,7 @@ static int ocfs2_replace_cow(struct ocfs2_cow_context= *context) struct ocfs2_super *osb =3D OCFS2_SB(inode->i_sb); =20 if (!ocfs2_refcount_tree(osb)) { - return ocfs2_error(inode->i_sb, "Inode %lu want to use refcount tree, bu= t the feature bit is not set in the super block\n", + return ocfs2_error(inode->i_sb, "Inode %" PRIino "u want to use refcount= tree, but the feature bit is not set in the super block\n", inode->i_ino); } =20 diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index 42ee5db362d3eb6df886d6721dd7398b8aca8cdb..74cd6dd57abf71a69adef18863d= 057e48496ccfe 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -3741,7 +3741,7 @@ static int ocfs2_xattr_get_rec(struct inode *inode, =20 if (el->l_tree_depth) { ret =3D ocfs2_error(inode->i_sb, - "Inode %lu has non zero tree depth in xattr tree block %llu\n", + "Inode %" PRIino "u has non zero tree depth in xattr tree block %ll= u\n", inode->i_ino, (unsigned long long)eb_bh->b_blocknr); goto out; @@ -3758,7 +3758,7 @@ static int ocfs2_xattr_get_rec(struct inode *inode, } =20 if (!e_blkno) { - ret =3D ocfs2_error(inode->i_sb, "Inode %lu has bad extent record (%u, %= u, 0) in xattr\n", + ret =3D ocfs2_error(inode->i_sb, "Inode %" PRIino "u has bad extent reco= rd (%u, %u, 0) in xattr\n", inode->i_ino, le32_to_cpu(rec->e_cpos), ocfs2_rec_clusters(el, rec)); --=20 2.53.0