On Mon 02-03-26 15:23:52, Jeff Layton wrote:
> Convert jbd2 i_ino format strings to use the PRIino format
> macro in preparation for the widening of i_ino via kino_t.
>
> Also correct signed format specifiers to unsigned, since inode
> numbers are unsigned values.
>
> Signed-off-by: Jeff Layton
Looks good. Feel free to add:
Reviewed-by: Jan Kara
Honza
> ---
> fs/jbd2/journal.c | 4 ++--
> fs/jbd2/transaction.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index
> cb2c529a8f1bea33df6d4135e5782b9a77792732..9df937f0e15c71028038e1c0c12159421a2444b4
> 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -1677,7 +1677,7 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
> return err ? ERR_PTR(err) : ERR_PTR(-EINVAL);
> }
>
> - jbd2_debug(1, "JBD2: inode %s/%ld, size %lld, bits %d, blksize %ld\n",
> + jbd2_debug(1, "JBD2: inode %s/%" PRIino "u, size %lld, bits %d, blksize
> %ld\n",
> inode->i_sb->s_id, inode->i_ino, (long long) inode->i_size,
> inode->i_sb->s_blocksize_bits, inode->i_sb->s_blocksize);
>
> @@ -1689,7 +1689,7 @@ journal_t *jbd2_journal_init_inode(struct inode *inode)
>
> journal->j_inode = inode;
> snprintf(journal->j_devname, sizeof(journal->j_devname),
> - "%pg-%lu", journal->j_dev, journal->j_inode->i_ino);
> + "%pg-%" PRIino "u", journal->j_dev, journal->j_inode->i_ino);
> strreplace(journal->j_devname, '/', '!');
> jbd2_stats_proc_init(journal);
>
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index
> dca4b5d83e1505b09fab42eb45bb201a8db8..2a03d4eafdee95e5caa8dbd0afe4e32ef4104378
> 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -2651,7 +2651,7 @@ static int jbd2_journal_file_inode(handle_t *handle,
> struct jbd2_inode *jinode,
> return -EROFS;
> journal = transaction->t_journal;
>
> - jbd2_debug(4, "Adding inode %lu, tid:%d\n", jinode->i_vfs_inode->i_ino,
> + jbd2_debug(4, "Adding inode %" PRIino "u, tid:%d\n",
> jinode->i_vfs_inode->i_ino,
> transaction->t_tid);
>
> spin_lock(&journal->j_list_lock);
>
> --
> 2.53.0
>
--
Jan Kara
SUSE Labs, CR
