Convert befs 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.
Remove now-unnecessary (unsigned long) casts on i_ino.
Signed-off-by: Jeff Layton jlayton@kernel.org --- fs/befs/linuxvfs.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index cecbc92f959aa5098313050b515c9af38662c8e6..c36216e23eb3678645cbdece913cc260fd10f4f8 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c @@ -140,20 +140,20 @@ befs_get_block(struct inode *inode, sector_t block, int res; ulong disk_off;
- befs_debug(sb, "---> befs_get_block() for inode %lu, block %ld", - (unsigned long)inode->i_ino, (long)block); + befs_debug(sb, "---> befs_get_block() for inode %" PRIino "u, block %ld", + inode->i_ino, (long)block); if (create) { befs_error(sb, "befs_get_block() was asked to write to " - "block %ld in inode %lu", (long)block, - (unsigned long)inode->i_ino); + "block %ld in inode %" PRIino "u", (long)block, + inode->i_ino); return -EPERM; }
res = befs_fblock2brun(sb, ds, block, &run); if (res != BEFS_OK) { befs_error(sb, - "<--- %s for inode %lu, block %ld ERROR", - __func__, (unsigned long)inode->i_ino, + "<--- %s for inode %" PRIino "u, block %ld ERROR", + __func__, inode->i_ino, (long)block); return -EFBIG; } @@ -162,8 +162,8 @@ befs_get_block(struct inode *inode, sector_t block,
map_bh(bh_result, inode->i_sb, disk_off);
- befs_debug(sb, "<--- %s for inode %lu, block %ld, disk address %lu", - __func__, (unsigned long)inode->i_ino, (long)block, + befs_debug(sb, "<--- %s for inode %" PRIino "u, block %ld, disk address %lu", + __func__, inode->i_ino, (long)block, (unsigned long)disk_off);
return 0; @@ -181,7 +181,7 @@ befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) char *utfname; const char *name = dentry->d_name.name;
- befs_debug(sb, "---> %s name %pd inode %ld", __func__, + befs_debug(sb, "---> %s name %pd inode %" PRIino "u", __func__, dentry, dir->i_ino);
/* Convert to UTF-8 */ @@ -224,7 +224,7 @@ befs_readdir(struct file *file, struct dir_context *ctx) size_t keysize; char keybuf[BEFS_NAME_LEN + 1];
- befs_debug(sb, "---> %s name %pD, inode %ld, ctx->pos %lld", + befs_debug(sb, "---> %s name %pD, inode %" PRIino "u, ctx->pos %lld", __func__, file, inode->i_ino, ctx->pos);
while (1) { @@ -233,7 +233,7 @@ befs_readdir(struct file *file, struct dir_context *ctx)
if (result == BEFS_ERR) { befs_debug(sb, "<--- %s ERROR", __func__); - befs_error(sb, "IO error reading %pD (inode %lu)", + befs_error(sb, "IO error reading %pD (inode %" PRIino "u)", file, inode->i_ino); return -EIO;
@@ -324,7 +324,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) bh = sb_bread(sb, inode->i_ino); if (!bh) { befs_error(sb, "unable to read inode block - " - "inode = %lu", inode->i_ino); + "inode = %" PRIino "u", inode->i_ino); goto unacquire_none; }
@@ -333,7 +333,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) befs_dump_inode(sb, raw_inode);
if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { - befs_error(sb, "Bad inode: %lu", inode->i_ino); + befs_error(sb, "Bad inode: %" PRIino "u", inode->i_ino); goto unacquire_bh; }
@@ -407,7 +407,7 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino) inode->i_op = &simple_symlink_inode_operations; } } else { - befs_error(sb, "Inode %lu is not a regular file, " + befs_error(sb, "Inode %" PRIino "u is not a regular file, " "directory or symlink. THAT IS WRONG! BeFS has no " "on disk special files", inode->i_ino); goto unacquire_bh;