On Mon, 2026-03-02 at 15:23 -0500, Jeff Layton wrote:
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 jlayton@kernel.org
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..a3c559c86e5a4c63b1c9dd4ca137f24749c3ee87 100644 --- a/fs/nilfs2/alloc.c +++ b/fs/nilfs2/alloc.c @@ -707,7 +707,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) nilfs_warn(inode->i_sb,
"%s (ino=%lu): entry number %llu already freed",
"%s (ino=%" PRIino "u): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)req->pr_entry_nr);@@ -748,7 +748,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) nilfs_warn(inode->i_sb,
"%s (ino=%lu): entry number %llu already freed",
"%s (ino=%" PRIino "u): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)req->pr_entry_nr);@@ -861,7 +861,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) { nilfs_warn(inode->i_sb,
"%s (ino=%lu): entry number %llu already freed",
"%s (ino=%" 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 *entry_nrs, size_t nitems) last_nrs[k]); if (ret && ret != -ENOENT) nilfs_warn(inode->i_sb,
"error %d deleting block that object (entry=%llu, ino=%lu) belongs to",
"error %d deleting block that object (entry=%llu, ino=%" PRIino "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 *entry_nrs, size_t nitems) ret = nilfs_palloc_delete_bitmap_block(inode, group); if (ret && ret != -ENOENT) nilfs_warn(inode->i_sb,
"error %d deleting bitmap block of group=%lu, ino=%lu",
"error %d deleting bitmap block of group=%lu, ino=%" PRIino "u", ret, group, inode->i_ino);diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c index ccc1a7aa52d2064d56b826058554264c498d592f..e12979bac3c3ee5eb7fcc2bf156fe6e48fc65a7d 100644 --- a/fs/nilfs2/bmap.c +++ b/fs/nilfs2/bmap.c @@ -33,7 +33,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap, if (err == -EINVAL) { __nilfs_error(inode->i_sb, fname,
"broken bmap (inode number=%lu)", inode->i_ino);
"broken bmap (inode number=%" PRIino "u)", inode->i_ino);diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index 56836712909201775907483887e8a0022851bbec..3d64f3a9223e5601dc2332ae6e1007edd5b4827b 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -64,7 +64,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 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 block address %llu (ino=%lu)",
"state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%" PRIino "u)", (unsigned long long)blocknr, inode->i_ino);diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index dd0c8e560ef6a2c96515025321914e0d73f41144..57163e991fbc49e2bfba2fa543f1b8dbd77718f4 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c @@ -353,7 +353,7 @@ static int nilfs_btree_node_broken(const struct nilfs_btree_node *node, nchildren <= 0 || nchildren > NILFS_BTREE_NODE_NCHILDREN_MAX(size))) { nilfs_crit(inode->i_sb,
"bad btree node (ino=%lu, blocknr=%llu): level = %d, flags = 0x%x, nchildren = %d",
"bad btree node (ino=%" PRIino "u, blocknr=%llu): level = %d, flags = 0x%x, nchildren = %d", inode->i_ino, (unsigned long long)blocknr, level, flags, nchildren);@@ -384,7 +384,7 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX || (nchildren == 0 && level > NILFS_BTREE_LEVEL_NODE_MIN))) { nilfs_crit(inode->i_sb,
"bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d",
"bad btree root (ino=%" PRIino "u): level = %d, flags = 0x%x, nchildren = %d", inode->i_ino, level, flags, nchildren);@@ -453,7 +453,7 @@ static int nilfs_btree_bad_node(const struct nilfs_bmap *btree, if (unlikely(nilfs_btree_node_get_level(node) != level)) { dump_stack(); nilfs_crit(btree->b_inode->i_sb,
"btree level mismatch (ino=%lu): %d != %d",
"btree level mismatch (ino=%" PRIino "u): %d != %d", btree->b_inode->i_ino, nilfs_btree_node_get_level(node), level);@@ -521,7 +521,7 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *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=%lu, blocknr=%llu)",
"I/O error reading b-tree node block (ino=%" PRIino "u, blocknr=%llu)", btree->b_inode->i_ino, (unsigned long long)ptr);@@ -2104,7 +2104,7 @@ static int nilfs_btree_propagate(struct nilfs_bmap *btree, if (ret < 0) { if (unlikely(ret == -ENOENT)) { nilfs_crit(btree->b_inode->i_sb,
"writing node/leaf block does not appear in b-tree (ino=%lu) at key=%llu, level=%d",
"writing node/leaf block does not appear in b-tree (ino=%" PRIino "u) at key=%llu, level=%d", btree->b_inode->i_ino, (unsigned long long)key, level); ret = -EINVAL;@@ -2146,7 +2146,7 @@ static void nilfs_btree_add_dirty_buffer(struct nilfs_bmap *btree, level >= NILFS_BTREE_LEVEL_MAX) { dump_stack(); nilfs_warn(btree->b_inode->i_sb,
"invalid btree level: %d (key=%llu, ino=%lu, blocknr=%llu)",
"invalid btree level: %d (key=%llu, ino=%" PRIino "u, blocknr=%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..b182da076c58c4813145bc3e501a1e9a188bce85 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) 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",Eshort: @@ -169,7 +169,7 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr) error = "disallowed inode number"; bad_entry: nilfs_error(sb,
"bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%zd, name_len=%d",
"bad entry in directory #%" PRIino "u: %s - offset=%lu, inode=%lu, rec_len=%zd, name_len=%d",@@ -177,7 +177,7 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr) Eend: p = (struct nilfs_dir_entry *)(kaddr + offs); nilfs_error(sb,
"entry in directory #%lu spans the page boundary offset=%lu, inode=%lu",
"entry in directory #%" PRIino "u spans the page boundary offset=%lu, inode=%lu",fail: @@ -251,7 +251,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) kaddr = 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 += 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; 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..1084d4d586e078ab6825167976dd2a71d52bc8aa 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 = nilfs_bmap_data_get_key(bmap, *bh); if (unlikely(key > NILFS_DIRECT_KEY_MAX)) { nilfs_crit(bmap->b_inode->i_sb,
"%s (ino=%lu): invalid key: %llu",
"%s (ino=%" PRIino "u): invalid key: %llu", __func__, bmap->b_inode->i_ino, (unsigned long long)key);@@ -346,7 +346,7 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, ptr = nilfs_direct_get_ptr(bmap, key); if (unlikely(ptr == NILFS_BMAP_INVALID_PTR)) { nilfs_crit(bmap->b_inode->i_sb,
"%s (ino=%lu): invalid pointer: %llu",
"%s (ino=%" PRIino "u): invalid pointer: %llu", __func__, bmap->b_inode->i_ino, (unsigned long long)ptr);diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c index 561c220799c7aee879ad866865e377799c8ee6bb..714962d010da4a23e9b5f40de8aaaca8b95a74da 100644 --- a/fs/nilfs2/gcinode.c +++ b/fs/nilfs2/gcinode.c @@ -137,7 +137,7 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_head *bh) struct inode *inode = bh->b_folio->mapping->host; nilfs_err(inode->i_sb,
"I/O error reading %s block for GC (ino=%lu, vblocknr=%llu)",
"I/O error reading %s block for GC (ino=%" PRIino "u, vblocknr=%llu)", buffer_nilfs_node(bh) ? "node" : "data", inode->i_ino, (unsigned long long)bh->b_blocknr);diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 51bde45d586509dda3ef0cb7c46facb7fb2c61dd..0bc1c5141ec596b3c31e7d18e4ba3541bf618406 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -108,7 +108,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff, * be locked in this case. */ nilfs_warn(inode->i_sb,
"%s (ino=%lu): a race condition while inserting a data block at offset=%llu",
"%s (ino=%" PRIino "u): a race condition while inserting a data block at offset=%llu", __func__, inode->i_ino, (unsigned long long)blkoff); err = -EAGAIN;@@ -789,7 +789,7 @@ static void nilfs_truncate_bmap(struct nilfs_inode_info *ii, goto repeat; failed:
- nilfs_warn(ii->vfs_inode.i_sb, "error %d truncating bmap (ino=%lu)",
- nilfs_warn(ii->vfs_inode.i_sb, "error %d truncating bmap (ino=%" PRIino "u)", ret, ii->vfs_inode.i_ino);
} @@ -1026,7 +1026,7 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned int nr_dirty) * this inode. */ nilfs_warn(inode->i_sb,
"cannot set file dirty (ino=%lu): the file is being freed",
"cannot set file dirty (ino=%" PRIino "u): the file is being freed", 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 = nilfs_load_inode_block(inode, &ibh); if (unlikely(err)) { nilfs_warn(inode->i_sb,
"cannot mark inode dirty (ino=%lu): error %d loading inode block",
"cannot mark inode dirty (ino=%" PRIino "u): error %d loading inode block", inode->i_ino, err);diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 946b0d3534a5f22f34ac44a91fb121541881c548..8629c72b62db33217d4747124885b6f727f182be 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -203,7 +203,7 @@ static int nilfs_mdt_read_block(struct inode *inode, unsigned long block, err = -EIO; if (!buffer_uptodate(first_bh)) { nilfs_err(inode->i_sb,
"I/O error reading meta-data file (ino=%lu, block-offset=%lu)",
"I/O error reading meta-data file (ino=%" PRIino "u, block-offset=%lu)", inode->i_ino, block);diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index 40f4b1a28705b6e0eb8f0978cf3ac18b43aa1331..29edb84a0663caa4b29fa488c0495fc53358ca00 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -292,7 +292,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) if (!inode->i_nlink) { nilfs_warn(inode->i_sb,
"deleting nonexistent file (ino=%lu), %d",
"deleting nonexistent file (ino=%" PRIino "u), %d", inode->i_ino, inode->i_nlink);diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 098a3bd103e04cd09b0689fe2017380d74664496..9a8bc3fa35ce9b447abbc2fb56cbd2b0cc5f76de 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2024,7 +2024,7 @@ static int nilfs_segctor_collect_dirty_files(struct nilfs_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=%lu)",
"log writer: error %d getting inode block (ino=%" 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..86a0011c9eeaf031cfa0b79875b2b106ef8b7cfd 100644 --- a/include/trace/events/nilfs2.h +++ b/include/trace/events/nilfs2.h @@ -165,14 +165,14 @@ TRACE_EVENT(nilfs2_segment_usage_freed, TRACE_EVENT(nilfs2_mdt_insert_new_block, TP_PROTO(struct inode *inode,
unsigned long ino,
u64 ino, unsigned long block),TP_ARGS(inode, ino, block), TP_STRUCT__entry( __field(struct inode *, inode)
__field(unsigned long, ino)
__field(u64, ino)@@ -182,7 +182,7 @@ TRACE_EVENT(nilfs2_mdt_insert_new_block, __entry->block = block; ),
TP_printk("inode = %p ino = %lu block = %lu",
TP_printk("inode = %p ino = %llu block = %lu", __entry->inode, __entry->ino, __entry->block)@@ -190,7 +190,7 @@ TRACE_EVENT(nilfs2_mdt_insert_new_block, TRACE_EVENT(nilfs2_mdt_submit_block, TP_PROTO(struct inode *inode,
unsigned long ino,
u64 ino, unsigned long blkoff, enum req_op mode),@@ -198,7 +198,7 @@ TRACE_EVENT(nilfs2_mdt_submit_block, TP_STRUCT__entry( __field(struct inode *, inode)
__field(unsigned long, ino)
__field(u64, ino)@@ -214,7 +214,7 @@ TRACE_EVENT(nilfs2_mdt_submit_block, __entry->mode = mode; ),
TP_printk("inode = %p ino = %lu blkoff = %lu mode = %x",
TP_printk("inode = %p ino = %llu blkoff = %lu mode = %x", __entry->inode, __entry->ino, __entry->blkoff,
Reviewed-by: Viacheslav Dubeyko slava@dubeyko.com
Thanks, Slava.