On Mon 02-03-26 15:25:11, Jeff Layton wrote: > Now that i_ino is u64 and the PRIino format macro has been removed, > replace all uses in isofs 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/isofs/compress.c | 2 +- > fs/isofs/dir.c | 2 +- > fs/isofs/inode.c | 6 +++--- > fs/isofs/namei.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/fs/isofs/compress.c b/fs/isofs/compress.c > index > dc6c7d247cf880720be47cd26d23206d25a4e453..397568b9c7e7d3e28873be02c8a4befcddaec7b5 > 100644 > --- a/fs/isofs/compress.c > +++ b/fs/isofs/compress.c > @@ -156,7 +156,7 @@ static loff_t zisofs_uncompress_block(struct inode > *inode, loff_t block_start, > else { > printk(KERN_DEBUG > "zisofs: zisofs_inflate returned" > - " %d, inode = %" PRIino "u," > + " %d, inode = %llu," > " page idx = %d, bh idx = %d," > " avail_in = %ld," > " avail_out = %ld\n", > diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c > index > 0a8f9e411c23425a6919b7a4fa3fb387eb2c3209..2fd9948d606e9c92f3003bfbaa4f0271c750a93d > 100644 > --- a/fs/isofs/dir.c > +++ b/fs/isofs/dir.c > @@ -152,7 +152,7 @@ static int do_isofs_readdir(struct inode *inode, struct > file *file, > de_len < de->name_len[0] + > sizeof(struct iso_directory_record)) { > printk(KERN_NOTICE "iso9660: Corrupted directory entry" > - " in block %lu of inode %" PRIino "u\n", block, > + " in block %lu of inode %llu\n", block, > inode->i_ino); > brelse(bh); > return -EIO; > diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c > index > 678d7363e157d893e005152e64e922d9170468d0..3593e02e75fef8567643137e0ff992019d2b6fbb > 100644 > --- a/fs/isofs/inode.c > +++ b/fs/isofs/inode.c > @@ -1261,7 +1261,7 @@ static int isofs_read_level3_size(struct inode *inode) > > out_toomany: > printk(KERN_INFO "%s: More than 100 file sections ?!?, aborting...\n" > - "isofs_read_level3_size: inode=%" PRIino "u\n", > + "isofs_read_level3_size: inode=%llu\n", > __func__, inode->i_ino); > goto out; > } > @@ -1380,7 +1380,7 @@ static int isofs_read_inode(struct inode *inode, int > relocated) > /* I have no idea what file_unit_size is used for, so > we will flag it for now */ > if (de->file_unit_size[0] != 0) { > - printk(KERN_DEBUG "ISOFS: File unit size != 0 for ISO file (%" > PRIino "u).\n", > + printk(KERN_DEBUG "ISOFS: File unit size != 0 for ISO file > (%llu).\n", > inode->i_ino); > } > > @@ -1450,7 +1450,7 @@ static int isofs_read_inode(struct inode *inode, int > relocated) > /* XXX - parse_rock_ridge_inode() had already set i_rdev. */ > init_special_inode(inode, inode->i_mode, inode->i_rdev); > } else { > - printk(KERN_DEBUG "ISOFS: Invalid file type 0%04o for inode %" > PRIino "u.\n", > + printk(KERN_DEBUG "ISOFS: Invalid file type 0%04o for inode > %llu.\n", > inode->i_mode, inode->i_ino); > ret = -EIO; > goto fail; > diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c > index > 494d2ae4c0955123335a97f23672b959dcc9e0bd..8dd3911717e0cc221f60fb6447e1bf26cc2223dd > 100644 > --- a/fs/isofs/namei.c > +++ b/fs/isofs/namei.c > @@ -100,7 +100,7 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, > /* Basic sanity check, whether name doesn't exceed dir entry */ > if (de_len < dlen + sizeof(struct iso_directory_record)) { > printk(KERN_NOTICE "iso9660: Corrupted directory entry" > - " in block %lu of inode %" PRIino "u\n", block, > + " in block %lu of inode %llu\n", block, > dir->i_ino); > brelse(bh); > return 0; > > -- > 2.53.0 > -- Jan Kara <[email protected]> SUSE Labs, CR
