Re: [PATCH v2 082/110] ext2: replace PRIino with %llu/%llx format strings

On Mon 02-03-26 15:25:06, Jeff Layton wrote:
> Now that i_ino is u64 and the PRIino format macro has been removed,
> replace all uses in ext2 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/ext2/dir.c    | 10 +++++-----
>  fs/ext2/ialloc.c |  2 +-
>  fs/ext2/inode.c  |  2 +-
>  fs/ext2/xattr.c  | 14 +++++++-------
>  4 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
> index f87106907da31bb7c1ca65c0ec2dcc0d47d27c62..278d4be8ecbe7790204b5ba985a7ce088fadb181 100644
> --- a/fs/ext2/dir.c
> +++ b/fs/ext2/dir.c
> @@ -141,7 +141,7 @@ static bool ext2_check_folio(struct folio *folio, int quiet, char *kaddr)
>  Ebadsize:
>  	if (!quiet)
>  		ext2_error(sb, __func__,
> -			"size of directory #%" PRIino "u is not a multiple "
> +			"size of directory #%llu is not a multiple "
>  			"of chunk size", dir->i_ino);
>  	goto fail;
>  Eshort:
> @@ -160,7 +160,7 @@ static bool ext2_check_folio(struct folio *folio, int quiet, char *kaddr)
>  	error = "inode out of bounds";
>  bad_entry:
>  	if (!quiet)
> -		ext2_error(sb, __func__, "bad entry in directory #%" PRIino "u: : %s - "
> +		ext2_error(sb, __func__, "bad entry in directory #%llu: : %s - "
>  			"offset=%llu, inode=%lu, rec_len=%d, name_len=%d",
>  			dir->i_ino, error, folio_pos(folio) + offs,
>  			(unsigned long) le32_to_cpu(p->inode),
> @@ -170,7 +170,7 @@ static bool ext2_check_folio(struct folio *folio, int quiet, char *kaddr)
>  	if (!quiet) {
>  		p = (ext2_dirent *)(kaddr + offs);
>  		ext2_error(sb, "ext2_check_folio",
> -			"entry in directory #%" PRIino "u spans the page boundary"
> +			"entry in directory #%llu spans the page boundary"
>  			"offset=%llu, inode=%lu",
>  			dir->i_ino, folio_pos(folio) + offs,
>  			(unsigned long) le32_to_cpu(p->inode));
> @@ -281,7 +281,7 @@ ext2_readdir(struct file *file, struct dir_context *ctx)
>  
>  		if (IS_ERR(kaddr)) {
>  			ext2_error(sb, __func__,
> -				   "bad page in #%" PRIino "u",
> +				   "bad page in #%llu",
>  				   inode->i_ino);
>  			ctx->pos += PAGE_SIZE - offset;
>  			return PTR_ERR(kaddr);
> @@ -383,7 +383,7 @@ struct ext2_dir_entry_2 *ext2_find_entry (struct inode *dir,
>  		/* next folio is past the blocks we've got */
>  		if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) {
>  			ext2_error(dir->i_sb, __func__,
> -				"dir %" PRIino "u size %lld exceeds block count %llu",
> +				"dir %llu size %lld exceeds block count %llu",
>  				dir->i_ino, dir->i_size,
>  				(unsigned long long)dir->i_blocks);
>  			goto out;
> diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
> index 6a317411e54191578343308b5a3990aea9c36436..bf21b57cf98cd5f90e1177454a8fd5cca482c2f8 100644
> --- a/fs/ext2/ialloc.c
> +++ b/fs/ext2/ialloc.c
> @@ -590,7 +590,7 @@ struct inode *ext2_new_inode(struct inode *dir, umode_t mode,
>  		goto fail_free_drop;
>  
>  	mark_inode_dirty(inode);
> -	ext2_debug("allocating inode %" PRIino "u\n", inode->i_ino);
> +	ext2_debug("allocating inode %llu\n", inode->i_ino);
>  	ext2_preread_inode(inode);
>  	return inode;
>  
> diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
> index 0ca9148583646812b478f01fd35bcad11498f951..45286c0c3b6b8f86a1ecec0e2f545c5a678dd6ac 100644
> --- a/fs/ext2/inode.c
> +++ b/fs/ext2/inode.c
> @@ -1152,7 +1152,7 @@ static void ext2_free_branches(struct inode *inode, __le32 *p, __le32 *q, int de
>  			 */ 
>  			if (!bh) {
>  				ext2_error(inode->i_sb, "ext2_free_branches",
> -					"Read failure, inode=%" PRIino "u, block=%ld",
> +					"Read failure, inode=%llu, block=%ld",
>  					inode->i_ino, nr);
>  				continue;
>  			}
> diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
> index 4b3dadc0a2a47c85682d9c74edb900cf0f20996f..14ada70db36a76d1436944a3622e5caf0b373b9e 100644
> --- a/fs/ext2/xattr.c
> +++ b/fs/ext2/xattr.c
> @@ -227,7 +227,7 @@ ext2_xattr_get(struct inode *inode, int name_index, const char *name,
>  	if (!ext2_xattr_header_valid(HDR(bh))) {
>  bad_block:
>  		ext2_error(inode->i_sb, "ext2_xattr_get",
> -			"inode %" PRIino "u: bad block %d", inode->i_ino,
> +			"inode %llu: bad block %d", inode->i_ino,
>  			EXT2_I(inode)->i_file_acl);
>  		error = -EIO;
>  		goto cleanup;
> @@ -313,7 +313,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
>  	if (!ext2_xattr_header_valid(HDR(bh))) {
>  bad_block:
>  		ext2_error(inode->i_sb, "ext2_xattr_list",
> -			"inode %" PRIino "u: bad block %d", inode->i_ino,
> +			"inode %llu: bad block %d", inode->i_ino,
>  			EXT2_I(inode)->i_file_acl);
>  		error = -EIO;
>  		goto cleanup;
> @@ -454,7 +454,7 @@ ext2_xattr_set(struct inode *inode, int name_index, const char *name,
>  		if (!ext2_xattr_header_valid(header)) {
>  bad_block:
>  			ext2_error(sb, "ext2_xattr_set",
> -				"inode %" PRIino "u: bad block %d", inode->i_ino,
> +				"inode %llu: bad block %d", inode->i_ino,
>  				   EXT2_I(inode)->i_file_acl);
>  			error = -EIO;
>  			goto cleanup;
> @@ -833,7 +833,7 @@ ext2_xattr_delete_inode(struct inode *inode)
>  
>  	if (!ext2_data_block_valid(sbi, EXT2_I(inode)->i_file_acl, 1)) {
>  		ext2_error(inode->i_sb, "ext2_xattr_delete_inode",
> -			"inode %" PRIino "u: xattr block %d is out of data blocks range",
> +			"inode %llu: xattr block %d is out of data blocks range",
>  			inode->i_ino, EXT2_I(inode)->i_file_acl);
>  		goto cleanup;
>  	}
> @@ -841,14 +841,14 @@ ext2_xattr_delete_inode(struct inode *inode)
>  	bh = sb_bread(inode->i_sb, EXT2_I(inode)->i_file_acl);
>  	if (!bh) {
>  		ext2_error(inode->i_sb, "ext2_xattr_delete_inode",
> -			"inode %" PRIino "u: block %d read error", inode->i_ino,
> +			"inode %llu: block %d read error", inode->i_ino,
>  			EXT2_I(inode)->i_file_acl);
>  		goto cleanup;
>  	}
>  	ea_bdebug(bh, "b_count=%d", atomic_read(&(bh->b_count)));
>  	if (!ext2_xattr_header_valid(HDR(bh))) {
>  		ext2_error(inode->i_sb, "ext2_xattr_delete_inode",
> -			"inode %" PRIino "u: bad block %d", inode->i_ino,
> +			"inode %llu: bad block %d", inode->i_ino,
>  			EXT2_I(inode)->i_file_acl);
>  		goto cleanup;
>  	}
> @@ -952,7 +952,7 @@ ext2_xattr_cache_find(struct inode *inode, struct ext2_xattr_header *header)
>  		bh = sb_bread(inode->i_sb, ce->e_value);
>  		if (!bh) {
>  			ext2_error(inode->i_sb, "ext2_xattr_cache_find",
> -				"inode %" PRIino "u: block %ld read error",
> +				"inode %llu: block %ld read error",
>  				inode->i_ino, (unsigned long) ce->e_value);
>  		} else {
>  			lock_buffer(bh);
> 
> -- 
> 2.53.0
> 
-- 
Jan Kara <[email protected]>
SUSE Labs, CR