On Mon 02-03-26 15:25:16, Jeff Layton wrote: > Now that i_ino is u64 and the PRIino format macro has been removed, > replace all uses in ocfs2 with the concrete format strings. > > Signed-off-by: Jeff Layton <[email protected]>
Looks good. Feel free to add: Reviewed-by: Jan Kara <[email protected]> Honza > --- > 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/refcounttree.c | 10 +++++----- > fs/ocfs2/xattr.c | 4 ++-- > 8 files changed, 26 insertions(+), 26 deletions(-) > > diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c > index > d7703549645b548d9f5d77b2214a9a7c0af0ef6f..d40f5d205bce3675ffd37e0e6c228e88c1804a1a > 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 == 0) { > - mlog(ML_ERROR, "Inode %" PRIino "u has an empty " > + mlog(ML_ERROR, "Inode %llu has an empty " > "extent record, depth %u\n", inode->i_ino, > le16_to_cpu(root_el->l_tree_depth)); > status = ocfs2_remove_rightmost_empty_extent(osb, > diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c > index > aea35b1c9fa3ce7327672c1862d0d1201c895c40..c7ad912ec7a0d6fffd09c3d38f110e5d1517d829 > 100644 > --- a/fs/ocfs2/aops.c > +++ b/fs/ocfs2/aops.c > @@ -137,7 +137,7 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock, > (unsigned long long)iblock, bh_result, create); > > if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE) > - mlog(ML_NOTICE, "get_block on system inode 0x%p (%" PRIino > "u)\n", > + mlog(ML_NOTICE, "get_block on system inode 0x%p (%llu)\n", > inode, inode->i_ino); > > 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 = (endblk - iblock + 1) << i_blkbits; > > - mlog(0, "get block of %" PRIino "u at %llu:%u req %u\n", > + mlog(0, "get block of %llu at %llu:%u req %u\n", > inode->i_ino, pos, len, total_len); > > /* > diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c > index > eecb2b1d2ec17fb4b3f09abb9e168d2f28f9b420..b82fe4431eb1f0811d81525237d02c5a3f3b021c > 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) != > ocfs2_extent_recs_per_dx_root(inode->i_sb)) { > ret = ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has invalid extent list > length %u\n", > + "Inode %llu 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, > > if (el->l_tree_depth) { > ret = ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has non zero tree > depth in btree tree block %llu\n", > + "Inode %llu has non zero tree depth > in btree tree block %llu\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, > > if (le16_to_cpu(el->l_next_free_rec) == 0) { > ret = ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has empty extent list at > depth %u\n", > + "Inode %llu 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, > > if (!found) { > ret = ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has bad extent record > (%u, %u, 0) in btree\n", > + "Inode %llu 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 > e96c1c574ff7dc3dffad58ce8536b7e337d3f6fa..5821e33df78fd92fabc7fe7fa1c3b3c62c50f9f8 > 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(); > > - mlog(0, "open called on inode %" PRIino "u, flags 0x%x\n", inode->i_ino, > + mlog(0, "open called on inode %llu, flags 0x%x\n", inode->i_ino, > file->f_flags); > > status = 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(); > > - mlog(0, "close called on inode %" PRIino "u\n", inode->i_ino); > + mlog(0, "close called on inode %llu\n", inode->i_ino); > > if (fp) { > level = fp->fp_lock_level; > @@ -242,7 +242,7 @@ static ssize_t dlmfs_file_write(struct file *filp, > int bytes_left; > struct inode *inode = file_inode(filp); > > - mlog(0, "inode %" PRIino "u, count = %zu, *ppos = %llu\n", > + mlog(0, "inode %llu, count = %zu, *ppos = %llu\n", > inode->i_ino, count, *ppos); > > if (*ppos >= DLM_LVB_LEN) > @@ -301,7 +301,7 @@ static void dlmfs_evict_inode(struct inode *inode) > > clear_inode(inode); > > - mlog(0, "inode %" PRIino "u\n", inode->i_ino); > + mlog(0, "inode %llu\n", inode->i_ino); > > ip = DLMFS_I(inode); > lockres = &ip->ip_lockres; > @@ -490,7 +490,7 @@ static int dlmfs_unlink(struct inode *dir, > int status; > struct inode *inode = d_inode(dentry); > > - mlog(0, "unlink inode %" PRIino "u\n", inode->i_ino); > + mlog(0, "unlink inode %llu\n", inode->i_ino); > > /* 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 > 3cf93a08f7a8946810ccd2de246be4d07a23b53b..eb5dcd17d43752c08eab423fd667b7c0363ba6a1 > 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, > > if (el->l_tree_depth) { > ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has non zero tree depth in leaf > block %llu\n", > + "Inode %llu has non zero tree depth in leaf block > %llu\n", > inode->i_ino, > (unsigned long long)eb_bh->b_blocknr); > ret = -EROFS; > @@ -427,7 +427,7 @@ static int ocfs2_get_clusters_nocache(struct inode *inode, > > if (el->l_tree_depth) { > ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has non zero tree depth > in leaf block %llu\n", > + "Inode %llu has non zero tree depth in leaf > block %llu\n", > inode->i_ino, > (unsigned long long)eb_bh->b_blocknr); > ret = -EROFS; > @@ -437,7 +437,7 @@ static int ocfs2_get_clusters_nocache(struct inode *inode, > > if (le16_to_cpu(el->l_next_free_rec) > le16_to_cpu(el->l_count)) { > ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has an invalid extent > (next_free_rec %u, count %u)\n", > + "Inode %llu 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 *inode, > > if (!rec->e_blkno) { > ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has bad extent record (%u, %u, > 0)\n", > + "Inode %llu 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, > > if (el->l_tree_depth) { > ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has non zero tree depth > in xattr leaf block %llu\n", > + "Inode %llu has non zero tree depth in > xattr leaf block %llu\n", > inode->i_ino, > (unsigned long long)eb_bh->b_blocknr); > ret = -EROFS; > @@ -580,7 +580,7 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 > v_cluster, > > if (!rec->e_blkno) { > ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has bad extent record > (%u, %u, 0) in xattr\n", > + "Inode %llu 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 > c3076b450de3599291c386ceeb8b2d26e8680904..26025ba2656c66b61866deaff60a0da204745c4f > 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); > > mlog_bug_on_msg(osb == NULL, > - "Inode=%" PRIino "u\n", inode->i_ino); > + "Inode=%llu\n", inode->i_ino); > > dquot_drop(inode); > > diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c > index > 1586c42fdabe70056bf7f103d583dd9000fe9510..6d7f44d3e929d94f3ba6121cc30a867887e0bbe3 > 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); > > if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) { > - ret = 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", > + ret = ocfs2_error(inode->i_sb, "Inode %llu want to use refcount > 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 inode > *inode, > u64 start_cpos = ocfs2_blocks_to_clusters(inode->i_sb, phys_blkno); > > if (!ocfs2_refcount_tree(OCFS2_SB(inode->i_sb))) { > - ret = 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", > + ret = ocfs2_error(inode->i_sb, "Inode %llu want to use refcount > 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 inode > *inode, > > if (el->l_tree_depth) { > ret = ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has non zero tree > depth in leaf block %llu\n", > + "Inode %llu 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 inode > *inode, > rec = &el->l_recs[i]; > > if (ocfs2_is_empty_extent(rec)) { > - mlog_bug_on_msg(i != 0, "Inode %" PRIino "u has empty > record in " > + mlog_bug_on_msg(i != 0, "Inode %llu 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 = OCFS2_SB(inode->i_sb); > > if (!ocfs2_refcount_tree(osb)) { > - 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", > + return ocfs2_error(inode->i_sb, "Inode %llu want to use > refcount tree, but the feature bit is not set in the super block\n", > inode->i_ino); > } > > diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c > index > 74cd6dd57abf71a69adef18863d057e48496ccfe..4d55ad963ac514b4b4081447af0992345facd83a > 100644 > --- a/fs/ocfs2/xattr.c > +++ b/fs/ocfs2/xattr.c > @@ -3741,7 +3741,7 @@ static int ocfs2_xattr_get_rec(struct inode *inode, > > if (el->l_tree_depth) { > ret = ocfs2_error(inode->i_sb, > - "Inode %" PRIino "u has non zero tree > depth in xattr tree block %llu\n", > + "Inode %llu has non zero tree depth > in xattr tree block %llu\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, > } > > if (!e_blkno) { > - ret = ocfs2_error(inode->i_sb, "Inode %" PRIino "u has bad > extent record (%u, %u, 0) in xattr\n", > + ret = ocfs2_error(inode->i_sb, "Inode %llu has bad extent > record (%u, %u, 0) in xattr\n", > inode->i_ino, > le32_to_cpu(rec->e_cpos), > ocfs2_rec_clusters(el, rec)); > > -- > 2.53.0 > -- Jan Kara <[email protected]> SUSE Labs, CR
