From nobody Tue Mar 3 05:09:08 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 51164496918; Mon, 2 Mar 2026 20:28: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=1772483316; cv=none; b=tSWHfqrj2+URmN1Wq/7ltMS5gwnXwn74p1ID6H500oWRtPxEBEr4nzuiGhhNuYwROxnyHusTCL1CzLl7VWBhMGwMxP49rESis8lA5kGCjQinWnM6zzuzSq4J/acfQqubOa7O4KGLHEBHRGIPm5nrrhxAEirFsYmTn5pBmDYwlnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772483316; c=relaxed/simple; bh=Or7iYbRQR6Ro+Fuj5qMWsLawwpEXd/6MxzP7NG3XnZg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CWVrVGrt5TKZGId8BE+n6d/zShKaBi8m/xHzITsLFRfFh2R7XoBPOW42CQUMIilDeVUuyJwYnRJzpRvoegDslF9+okylWwOyPPGMUb2KYjMXFaZlpdV7CNqllzDQb/hkmxQeIeinDxzTfw5CKgP0A6Y7G5Ac1RlQunqxzvSQfnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nB4qX4iC; 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="nB4qX4iC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14692C2BCB2; Mon, 2 Mar 2026 20:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772483316; bh=Or7iYbRQR6Ro+Fuj5qMWsLawwpEXd/6MxzP7NG3XnZg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nB4qX4iCYlM35xdkH6/Uw6G9kPQXa2L8EjnyixkDTGHa3d38dYxuUOIMZIlgO0buI HE2lGeCQsT9WGrKguSE2Czg8rxw8eB+G6r3EQpQ1myFPqugBpbnnHapogszfWufhJm dRJEbdFSvRiki8hsTGDVS7502/vAIthh+AzzglAIjTNYO+a4tBX9NIo6fw3UlzEGdr NLVctwS/W2tAsoPR9l7d+mwjy56WWDqThK8jatFewHVyn8XVqD82EgmilmfN+JdjFt IWBD6ftQgREqH4wZBYHNuEls21K6UMs3WCge84SEbUI+MPaX1p74+Us/mwAoBNkyyX +BTuONLbJioBg== From: Jeff Layton Date: Mon, 02 Mar 2026 15:23:59 -0500 Subject: [PATCH v2 015/110] nilfs2: 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-15-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=16704; i=jlayton@kernel.org; h=from:subject:message-id; bh=Or7iYbRQR6Ro+Fuj5qMWsLawwpEXd/6MxzP7NG3XnZg=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBppfHzwdeQbqcbgLI0t0wCI2faFowE5GGxHJH6Z 53+uguafKiJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaXx8wAKCRAADmhBGVaC FblPEACIUyAQba7TcUmoHV39z8VNqlHgNYtG7nJUQ/M9Ay+a3BVuy+SPDhRUC863GWzAUEzPPKB p72eCRz7CssKpp/fw40BgFL5h4tIq3d5JFZ7DrHHJ7BE//OvLEZBepoVaB4g40LaQxtB8Q54d1Z wOU8bV6lYUxZ4omB4tKpxyEQeT93dirbiZsrGfoyOOrQaCL/WR+un5vFkrk7+3Is1slFDfy/Zsa h3mUQTy4cngiRStBazF4oXglOgEqG+bTzsVPS/N7YzKz5zYo8Obbw4dy2k1EiKSOv2vCbWorKfN zHdFfJ0LjOLJ6N9IDCkyYrvrMSCDfSqFK2gbm577jR/Khm3Wi5Bo07ym7HiFez98LYL3BIj6o8d HYL/uoZabfD8Z0Y4hySvnn2XBk2sMXKGb0FaqnrD/TjTnOoiIMIb+ndwpT31aR62zN1TSIYcBLL vzxsq6/xBsTfJ9rxom7ylkaPD0m0ppYrxC36TRPZyZ1IG0j9MsFyKmmJkiK8BsDdMKAwpcUlvPl k/iRTCrlhXSZZXnDnylSlvkBzXIEdvSAOkGnUG79nMhwpUSCxRTCILKWxW8bMA3REE3r+MpGACt aj8tekLtOzvlNkGFCPTZpGwe4ZY4FIA55bZvXKS/4I3l6ffVClsq4VhH3NbSOTN8mt+8w4DWAN9 a2KYOjBAjzNOwdw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Convert nilfs2 i_ino format strings to use the PRIino format macro in preparation for the widening of i_ino via kino_t. 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 Reviewed-by: Viacheslav Dubeyko --- fs/nilfs2/alloc.c | 10 +++++----- fs/nilfs2/bmap.c | 2 +- fs/nilfs2/btnode.c | 2 +- fs/nilfs2/btree.c | 12 ++++++------ fs/nilfs2/dir.c | 12 ++++++------ fs/nilfs2/direct.c | 4 ++-- fs/nilfs2/gcinode.c | 2 +- fs/nilfs2/inode.c | 8 ++++---- fs/nilfs2/mdt.c | 2 +- fs/nilfs2/namei.c | 2 +- fs/nilfs2/segment.c | 2 +- include/trace/events/nilfs2.h | 12 ++++++------ 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c index e7eebb04f9a4080a39f17d4123e58ed7df6b2f4b..a3c559c86e5a4c63b1c9dd4ca13= 7f24749c3ee87 100644 --- a/fs/nilfs2/alloc.c +++ b/fs/nilfs2/alloc.c @@ -707,7 +707,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, =20 if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) nilfs_warn(inode->i_sb, - "%s (ino=3D%lu): entry number %llu already freed", + "%s (ino=3D%" PRIino "u): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)req->pr_entry_nr); else @@ -748,7 +748,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, =20 if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) nilfs_warn(inode->i_sb, - "%s (ino=3D%lu): entry number %llu already freed", + "%s (ino=3D%" PRIino "u): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)req->pr_entry_nr); else @@ -861,7 +861,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entr= y_nrs, size_t nitems) if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) { nilfs_warn(inode->i_sb, - "%s (ino=3D%lu): entry number %llu already freed", + "%s (ino=3D%" PRIino "u): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)entry_nrs[j]); } else { @@ -906,7 +906,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entr= y_nrs, size_t nitems) last_nrs[k]); if (ret && ret !=3D -ENOENT) nilfs_warn(inode->i_sb, - "error %d deleting block that object (entry=3D%llu, ino=3D%lu) bel= ongs to", + "error %d deleting block that object (entry=3D%llu, ino=3D%" PRIin= o "u) belongs to", ret, (unsigned long long)last_nrs[k], inode->i_ino); } @@ -923,7 +923,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entr= y_nrs, size_t nitems) ret =3D nilfs_palloc_delete_bitmap_block(inode, group); if (ret && ret !=3D -ENOENT) nilfs_warn(inode->i_sb, - "error %d deleting bitmap block of group=3D%lu, ino=3D%lu", + "error %d deleting bitmap block of group=3D%lu, ino=3D%" PRIino "u= ", ret, group, inode->i_ino); } } diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c index ccc1a7aa52d2064d56b826058554264c498d592f..e12979bac3c3ee5eb7fcc2bf156= fe6e48fc65a7d 100644 --- a/fs/nilfs2/bmap.c +++ b/fs/nilfs2/bmap.c @@ -33,7 +33,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bm= ap, =20 if (err =3D=3D -EINVAL) { __nilfs_error(inode->i_sb, fname, - "broken bmap (inode number=3D%lu)", inode->i_ino); + "broken bmap (inode number=3D%" PRIino "u)", inode->i_ino); err =3D -EIO; } return err; diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index 56836712909201775907483887e8a0022851bbec..3d64f3a9223e5601dc2332ae6e1= 007edd5b4827b 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -64,7 +64,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u= 64 blocknr) * clearing of an abandoned b-tree node is missing somewhere). */ nilfs_error(inode->i_sb, - "state inconsistency probably due to duplicate use of b-tree node b= lock address %llu (ino=3D%lu)", + "state inconsistency probably due to duplicate use of b-tree node b= lock address %llu (ino=3D%" PRIino "u)", (unsigned long long)blocknr, inode->i_ino); goto failed; } diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index dd0c8e560ef6a2c96515025321914e0d73f41144..57163e991fbc49e2bfba2fa543f= 1b8dbd77718f4 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c @@ -353,7 +353,7 @@ static int nilfs_btree_node_broken(const struct nilfs_b= tree_node *node, nchildren <=3D 0 || nchildren > NILFS_BTREE_NODE_NCHILDREN_MAX(size))) { nilfs_crit(inode->i_sb, - "bad btree node (ino=3D%lu, blocknr=3D%llu): level =3D %d, flags =3D= 0x%x, nchildren =3D %d", + "bad btree node (ino=3D%" PRIino "u, blocknr=3D%llu): level =3D %d, = flags =3D 0x%x, nchildren =3D %d", inode->i_ino, (unsigned long long)blocknr, level, flags, nchildren); ret =3D 1; @@ -384,7 +384,7 @@ static int nilfs_btree_root_broken(const struct nilfs_b= tree_node *node, nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX || (nchildren =3D=3D 0 && level > NILFS_BTREE_LEVEL_NODE_MIN))) { nilfs_crit(inode->i_sb, - "bad btree root (ino=3D%lu): level =3D %d, flags =3D 0x%x, nchildren= =3D %d", + "bad btree root (ino=3D%" PRIino "u): level =3D %d, flags =3D 0x%x, = nchildren =3D %d", inode->i_ino, level, flags, nchildren); ret =3D 1; } @@ -453,7 +453,7 @@ static int nilfs_btree_bad_node(const struct nilfs_bmap= *btree, if (unlikely(nilfs_btree_node_get_level(node) !=3D level)) { dump_stack(); nilfs_crit(btree->b_inode->i_sb, - "btree level mismatch (ino=3D%lu): %d !=3D %d", + "btree level mismatch (ino=3D%" PRIino "u): %d !=3D %d", btree->b_inode->i_ino, nilfs_btree_node_get_level(node), level); return 1; @@ -521,7 +521,7 @@ static int __nilfs_btree_get_block(const struct nilfs_b= map *btree, __u64 ptr, out_no_wait: if (!buffer_uptodate(bh)) { nilfs_err(btree->b_inode->i_sb, - "I/O error reading b-tree node block (ino=3D%lu, blocknr=3D%llu)", + "I/O error reading b-tree node block (ino=3D%" PRIino "u, blocknr=3D%= llu)", btree->b_inode->i_ino, (unsigned long long)ptr); brelse(bh); return -EIO; @@ -2104,7 +2104,7 @@ static int nilfs_btree_propagate(struct nilfs_bmap *b= tree, if (ret < 0) { if (unlikely(ret =3D=3D -ENOENT)) { nilfs_crit(btree->b_inode->i_sb, - "writing node/leaf block does not appear in b-tree (ino=3D%lu) at k= ey=3D%llu, level=3D%d", + "writing node/leaf block does not appear in b-tree (ino=3D%" PRIino= "u) at key=3D%llu, level=3D%d", btree->b_inode->i_ino, (unsigned long long)key, level); ret =3D -EINVAL; @@ -2146,7 +2146,7 @@ static void nilfs_btree_add_dirty_buffer(struct nilfs= _bmap *btree, level >=3D NILFS_BTREE_LEVEL_MAX) { dump_stack(); nilfs_warn(btree->b_inode->i_sb, - "invalid btree level: %d (key=3D%llu, ino=3D%lu, blocknr=3D%llu)", + "invalid btree level: %d (key=3D%llu, ino=3D%" PRIino "u, blocknr=3D= %llu)", level, (unsigned long long)key, btree->b_inode->i_ino, (unsigned long long)bh->b_blocknr); diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index b243199036dfa1ab2299efaaa5bdf5da2d159ff2..b182da076c58c4813145bc3e501= a1e9a188bce85 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -150,7 +150,7 @@ static bool nilfs_check_folio(struct folio *folio, char= *kaddr) =20 Ebadsize: nilfs_error(sb, - "size of directory #%lu is not a multiple of chunk size", + "size of directory #%" PRIino "u is not a multiple of chunk size", dir->i_ino); goto fail; Eshort: @@ -169,7 +169,7 @@ static bool nilfs_check_folio(struct folio *folio, char= *kaddr) error =3D "disallowed inode number"; bad_entry: nilfs_error(sb, - "bad entry in directory #%lu: %s - offset=3D%lu, inode=3D%lu, rec_le= n=3D%zd, name_len=3D%d", + "bad entry in directory #%" PRIino "u: %s - offset=3D%lu, inode=3D%l= u, rec_len=3D%zd, name_len=3D%d", dir->i_ino, error, (folio->index << PAGE_SHIFT) + offs, (unsigned long)le64_to_cpu(p->inode), rec_len, p->name_len); @@ -177,7 +177,7 @@ static bool nilfs_check_folio(struct folio *folio, char= *kaddr) Eend: p =3D (struct nilfs_dir_entry *)(kaddr + offs); nilfs_error(sb, - "entry in directory #%lu spans the page boundary offset=3D%lu, inode= =3D%lu", + "entry in directory #%" PRIino "u spans the page boundary offset=3D%= lu, inode=3D%lu", dir->i_ino, (folio->index << PAGE_SHIFT) + offs, (unsigned long)le64_to_cpu(p->inode)); fail: @@ -251,7 +251,7 @@ static int nilfs_readdir(struct file *file, struct dir_= context *ctx) =20 kaddr =3D nilfs_get_folio(inode, n, &folio); if (IS_ERR(kaddr)) { - nilfs_error(sb, "bad page in #%lu", inode->i_ino); + nilfs_error(sb, "bad page in #%" PRIino "u", inode->i_ino); ctx->pos +=3D PAGE_SIZE - offset; return -EIO; } @@ -336,7 +336,7 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *= dir, /* next folio is past the blocks we've got */ if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) { nilfs_error(dir->i_sb, - "dir %lu size %lld exceeds block count %llu", + "dir %" PRIino "u size %lld exceeds block count %llu", dir->i_ino, dir->i_size, (unsigned long long)dir->i_blocks); goto out; @@ -382,7 +382,7 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir,= struct folio **foliop) return next_de; =20 fail: - nilfs_error(dir->i_sb, "directory #%lu %s", dir->i_ino, msg); + nilfs_error(dir->i_sb, "directory #%" PRIino "u %s", dir->i_ino, msg); folio_release_kmap(folio, de); return NULL; } diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c index 2d8dc6b35b5477947ca12a70288d3a3cce858aab..1084d4d586e078ab6825167976d= d2a71d52bc8aa 100644 --- a/fs/nilfs2/direct.c +++ b/fs/nilfs2/direct.c @@ -338,7 +338,7 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, key =3D nilfs_bmap_data_get_key(bmap, *bh); if (unlikely(key > NILFS_DIRECT_KEY_MAX)) { nilfs_crit(bmap->b_inode->i_sb, - "%s (ino=3D%lu): invalid key: %llu", + "%s (ino=3D%" PRIino "u): invalid key: %llu", __func__, bmap->b_inode->i_ino, (unsigned long long)key); return -EINVAL; @@ -346,7 +346,7 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, ptr =3D nilfs_direct_get_ptr(bmap, key); if (unlikely(ptr =3D=3D NILFS_BMAP_INVALID_PTR)) { nilfs_crit(bmap->b_inode->i_sb, - "%s (ino=3D%lu): invalid pointer: %llu", + "%s (ino=3D%" PRIino "u): invalid pointer: %llu", __func__, bmap->b_inode->i_ino, (unsigned long long)ptr); return -EINVAL; diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c index 561c220799c7aee879ad866865e377799c8ee6bb..714962d010da4a23e9b5f40de8a= aaca8b95a74da 100644 --- a/fs/nilfs2/gcinode.c +++ b/fs/nilfs2/gcinode.c @@ -137,7 +137,7 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_hea= d *bh) struct inode *inode =3D bh->b_folio->mapping->host; =20 nilfs_err(inode->i_sb, - "I/O error reading %s block for GC (ino=3D%lu, vblocknr=3D%llu)", + "I/O error reading %s block for GC (ino=3D%" PRIino "u, vblocknr=3D%l= lu)", buffer_nilfs_node(bh) ? "node" : "data", inode->i_ino, (unsigned long long)bh->b_blocknr); return -EIO; diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 51bde45d586509dda3ef0cb7c46facb7fb2c61dd..0bc1c5141ec596b3c31e7d18e4b= a3541bf618406 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -108,7 +108,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkof= f, * be locked in this case. */ nilfs_warn(inode->i_sb, - "%s (ino=3D%lu): a race condition while inserting a data block at = offset=3D%llu", + "%s (ino=3D%" PRIino "u): a race condition while inserting a data = block at offset=3D%llu", __func__, inode->i_ino, (unsigned long long)blkoff); err =3D -EAGAIN; @@ -789,7 +789,7 @@ static void nilfs_truncate_bmap(struct nilfs_inode_info= *ii, goto repeat; =20 failed: - nilfs_warn(ii->vfs_inode.i_sb, "error %d truncating bmap (ino=3D%lu)", + nilfs_warn(ii->vfs_inode.i_sb, "error %d truncating bmap (ino=3D%" PRIino= "u)", ret, ii->vfs_inode.i_ino); } =20 @@ -1026,7 +1026,7 @@ int nilfs_set_file_dirty(struct inode *inode, unsigne= d int nr_dirty) * this inode. */ nilfs_warn(inode->i_sb, - "cannot set file dirty (ino=3D%lu): the file is being freed", + "cannot set file dirty (ino=3D%" PRIino "u): the file is being free= d", inode->i_ino); spin_unlock(&nilfs->ns_inode_lock); return -EINVAL; /* @@ -1057,7 +1057,7 @@ int __nilfs_mark_inode_dirty(struct inode *inode, int= flags) err =3D nilfs_load_inode_block(inode, &ibh); if (unlikely(err)) { nilfs_warn(inode->i_sb, - "cannot mark inode dirty (ino=3D%lu): error %d loading inode block", + "cannot mark inode dirty (ino=3D%" PRIino "u): error %d loading inod= e block", inode->i_ino, err); return err; } diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 946b0d3534a5f22f34ac44a91fb121541881c548..8629c72b62db33217d474712488= 5b6f727f182be 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -203,7 +203,7 @@ static int nilfs_mdt_read_block(struct inode *inode, un= signed long block, err =3D -EIO; if (!buffer_uptodate(first_bh)) { nilfs_err(inode->i_sb, - "I/O error reading meta-data file (ino=3D%lu, block-offset=3D%lu)", + "I/O error reading meta-data file (ino=3D%" PRIino "u, block-offset= =3D%lu)", inode->i_ino, block); goto failed_bh; } diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index 40f4b1a28705b6e0eb8f0978cf3ac18b43aa1331..29edb84a0663caa4b29fa488c04= 95fc53358ca00 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -292,7 +292,7 @@ static int nilfs_do_unlink(struct inode *dir, struct de= ntry *dentry) =20 if (!inode->i_nlink) { nilfs_warn(inode->i_sb, - "deleting nonexistent file (ino=3D%lu), %d", + "deleting nonexistent file (ino=3D%" PRIino "u), %d", inode->i_ino, inode->i_nlink); set_nlink(inode, 1); } diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 098a3bd103e04cd09b0689fe2017380d74664496..9a8bc3fa35ce9b447abbc2fb56c= bd2b0cc5f76de 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2024,7 +2024,7 @@ static int nilfs_segctor_collect_dirty_files(struct n= ilfs_sc_info *sci, ifile, ii->vfs_inode.i_ino, &ibh); if (unlikely(err)) { nilfs_warn(sci->sc_super, - "log writer: error %d getting inode block (ino=3D%lu)", + "log writer: error %d getting inode block (ino=3D%" PRIino "u)", err, ii->vfs_inode.i_ino); return err; } diff --git a/include/trace/events/nilfs2.h b/include/trace/events/nilfs2.h index 8880c11733dd307c223cc62ee34ebeff650ecb12..86a0011c9eeaf031cfa0b79875b= 2b106ef8b7cfd 100644 --- a/include/trace/events/nilfs2.h +++ b/include/trace/events/nilfs2.h @@ -165,14 +165,14 @@ TRACE_EVENT(nilfs2_segment_usage_freed, =20 TRACE_EVENT(nilfs2_mdt_insert_new_block, TP_PROTO(struct inode *inode, - unsigned long ino, + u64 ino, unsigned long block), =20 TP_ARGS(inode, ino, block), =20 TP_STRUCT__entry( __field(struct inode *, inode) - __field(unsigned long, ino) + __field(u64, ino) __field(unsigned long, block) ), =20 @@ -182,7 +182,7 @@ TRACE_EVENT(nilfs2_mdt_insert_new_block, __entry->block =3D block; ), =20 - TP_printk("inode =3D %p ino =3D %lu block =3D %lu", + TP_printk("inode =3D %p ino =3D %llu block =3D %lu", __entry->inode, __entry->ino, __entry->block) @@ -190,7 +190,7 @@ TRACE_EVENT(nilfs2_mdt_insert_new_block, =20 TRACE_EVENT(nilfs2_mdt_submit_block, TP_PROTO(struct inode *inode, - unsigned long ino, + u64 ino, unsigned long blkoff, enum req_op mode), =20 @@ -198,7 +198,7 @@ TRACE_EVENT(nilfs2_mdt_submit_block, =20 TP_STRUCT__entry( __field(struct inode *, inode) - __field(unsigned long, ino) + __field(u64, ino) __field(unsigned long, blkoff) /* * Use field_struct() to avoid is_signed_type() on the @@ -214,7 +214,7 @@ TRACE_EVENT(nilfs2_mdt_submit_block, __entry->mode =3D mode; ), =20 - TP_printk("inode =3D %p ino =3D %lu blkoff =3D %lu mode =3D %x", + TP_printk("inode =3D %p ino =3D %llu blkoff =3D %lu mode =3D %x", __entry->inode, __entry->ino, __entry->blkoff, --=20 2.53.0