[PATCH v2 031/110] hfs: use PRIino format for i_ino

2026-03-03 Thread Jeff Layton
Convert hfs i_ino format strings to use the PRIino format
macro in preparation for the widening of i_ino via kino_t.

Signed-off-by: Jeff Layton 
---
 fs/hfs/catalog.c | 2 +-
 fs/hfs/extent.c  | 4 ++--
 fs/hfs/inode.c   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
index 
b80ba40e38776123759df4b85c7f65daa19c6436..b07c0a3ffc61584165e8cc9f646de6066a6ad2c9
 100644
--- a/fs/hfs/catalog.c
+++ b/fs/hfs/catalog.c
@@ -417,7 +417,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const 
struct qstr *src_name,
int entry_size, type;
int err;
 
-   hfs_dbg("cnid %u - (ino %lu, name %s) - (ino %lu, name %s)\n",
+   hfs_dbg("cnid %u - (ino %" PRIino "u, name %s) - (ino %" PRIino "u, 
name %s)\n",
cnid, src_dir->i_ino, src_name->name,
dst_dir->i_ino, dst_name->name);
sb = src_dir->i_sb;
diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c
index 
a097908b269d0ad1575847dd01d6d4a4538262bf..60875cc23880b7585e4b8281d9ee1f2dbcbb
 100644
--- a/fs/hfs/extent.c
+++ b/fs/hfs/extent.c
@@ -411,7 +411,7 @@ int hfs_extend_file(struct inode *inode)
goto out;
}
 
-   hfs_dbg("ino %lu, start %u, len %u\n", inode->i_ino, start, len);
+   hfs_dbg("ino %" PRIino "u, start %u, len %u\n", inode->i_ino, start, 
len);
if (HFS_I(inode)->alloc_blocks == HFS_I(inode)->first_blocks) {
if (!HFS_I(inode)->first_blocks) {
hfs_dbg("first_extent: start %u, len %u\n",
@@ -482,7 +482,7 @@ void hfs_file_truncate(struct inode *inode)
u32 size;
int res;
 
-   hfs_dbg("ino %lu, phys_size %llu -> i_size %llu\n",
+   hfs_dbg("ino %" PRIino "u, phys_size %llu -> i_size %llu\n",
inode->i_ino, (long long)HFS_I(inode)->phys_size,
inode->i_size);
if (inode->i_size > HFS_I(inode)->phys_size) {
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 
878535db64d679995cd1f5c215f56c5258c3c720..b19866525c1e9c43decf3a943c709922ee8630f6
 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -270,7 +270,7 @@ void hfs_delete_inode(struct inode *inode)
 {
struct super_block *sb = inode->i_sb;
 
-   hfs_dbg("ino %lu\n", inode->i_ino);
+   hfs_dbg("ino %" PRIino "u\n", inode->i_ino);
if (S_ISDIR(inode->i_mode)) {
atomic64_dec(&HFS_SB(sb)->folder_count);
if (HFS_I(inode)->cat_key.ParID == cpu_to_be32(HFS_ROOT_CNID))
@@ -455,7 +455,7 @@ int hfs_write_inode(struct inode *inode, struct 
writeback_control *wbc)
hfs_cat_rec rec;
int res;
 
-   hfs_dbg("ino %lu\n", inode->i_ino);
+   hfs_dbg("ino %" PRIino "u\n", inode->i_ino);
res = hfs_ext_write_extent(inode);
if (res)
return res;

-- 
2.53.0



Re: [PATCH v2 031/110] hfs: use PRIino format for i_ino

2026-03-03 Thread Viacheslav Dubeyko
On Mon, 2026-03-02 at 15:24 -0500, Jeff Layton wrote:
> Convert hfs i_ino format strings to use the PRIino format
> macro in preparation for the widening of i_ino via kino_t.
> 
> Signed-off-by: Jeff Layton 
> ---
>  fs/hfs/catalog.c | 2 +-
>  fs/hfs/extent.c  | 4 ++--
>  fs/hfs/inode.c   | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
> index 
> b80ba40e38776123759df4b85c7f65daa19c6436..b07c0a3ffc61584165e8cc9f646de6066a6ad2c9
>  100644
> --- a/fs/hfs/catalog.c
> +++ b/fs/hfs/catalog.c
> @@ -417,7 +417,7 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, const 
> struct qstr *src_name,
>   int entry_size, type;
>   int err;
>  
> - hfs_dbg("cnid %u - (ino %lu, name %s) - (ino %lu, name %s)\n",
> + hfs_dbg("cnid %u - (ino %" PRIino "u, name %s) - (ino %" PRIino "u, 
> name %s)\n",
>   cnid, src_dir->i_ino, src_name->name,
>   dst_dir->i_ino, dst_name->name);
>   sb = src_dir->i_sb;
> diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c
> index 
> a097908b269d0ad1575847dd01d6d4a4538262bf..60875cc23880b7585e4b8281d9ee1f2dbcbb
>  100644
> --- a/fs/hfs/extent.c
> +++ b/fs/hfs/extent.c
> @@ -411,7 +411,7 @@ int hfs_extend_file(struct inode *inode)
>   goto out;
>   }
>  
> - hfs_dbg("ino %lu, start %u, len %u\n", inode->i_ino, start, len);
> + hfs_dbg("ino %" PRIino "u, start %u, len %u\n", inode->i_ino, start, 
> len);
>   if (HFS_I(inode)->alloc_blocks == HFS_I(inode)->first_blocks) {
>   if (!HFS_I(inode)->first_blocks) {
>   hfs_dbg("first_extent: start %u, len %u\n",
> @@ -482,7 +482,7 @@ void hfs_file_truncate(struct inode *inode)
>   u32 size;
>   int res;
>  
> - hfs_dbg("ino %lu, phys_size %llu -> i_size %llu\n",
> + hfs_dbg("ino %" PRIino "u, phys_size %llu -> i_size %llu\n",
>   inode->i_ino, (long long)HFS_I(inode)->phys_size,
>   inode->i_size);
>   if (inode->i_size > HFS_I(inode)->phys_size) {
> diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
> index 
> 878535db64d679995cd1f5c215f56c5258c3c720..b19866525c1e9c43decf3a943c709922ee8630f6
>  100644
> --- a/fs/hfs/inode.c
> +++ b/fs/hfs/inode.c
> @@ -270,7 +270,7 @@ void hfs_delete_inode(struct inode *inode)
>  {
>   struct super_block *sb = inode->i_sb;
>  
> - hfs_dbg("ino %lu\n", inode->i_ino);
> + hfs_dbg("ino %" PRIino "u\n", inode->i_ino);
>   if (S_ISDIR(inode->i_mode)) {
>   atomic64_dec(&HFS_SB(sb)->folder_count);
>   if (HFS_I(inode)->cat_key.ParID == cpu_to_be32(HFS_ROOT_CNID))
> @@ -455,7 +455,7 @@ int hfs_write_inode(struct inode *inode, struct 
> writeback_control *wbc)
>   hfs_cat_rec rec;
>   int res;
>  
> - hfs_dbg("ino %lu\n", inode->i_ino);
> + hfs_dbg("ino %" PRIino "u\n", inode->i_ino);
>   res = hfs_ext_write_extent(inode);
>   if (res)
>   return res;

Reviewed-by: Viacheslav Dubeyko 

Thanks,
Slava.