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

2026-03-03 Thread Viacheslav Dubeyko 
On Mon, 2026-03-02 at 15:24 -0500, Jeff Layton wrote:
> Now that i_ino is u64 and the PRIino format macro has been removed,
> replace all uses in nilfs2 with the concrete format strings.
> 
> Signed-off-by: Jeff Layton 
> ---
>  fs/nilfs2/alloc.c   | 10 +-
>  fs/nilfs2/bmap.c|  2 +-
>  fs/nilfs2/btnode.c  |  2 +-
>  fs/nilfs2/btree.c   | 12 ++--
>  fs/nilfs2/dir.c | 12 ++--
>  fs/nilfs2/direct.c  |  4 ++--
>  fs/nilfs2/gcinode.c |  2 +-
>  fs/nilfs2/inode.c   |  8 
>  fs/nilfs2/mdt.c |  2 +-
>  fs/nilfs2/namei.c   |  2 +-
>  fs/nilfs2/segment.c |  2 +-
>  11 files changed, 29 insertions(+), 29 deletions(-)
> 
> diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
> index 
> a3c559c86e5a4c63b1c9dd4ca137f24749c3ee87..7b1cd2baefcf21e54f9260845b02c7c95c148c64
>  100644
> --- a/fs/nilfs2/alloc.c
> +++ b/fs/nilfs2/alloc.c
> @@ -707,7 +707,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode,
>  
>   if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
>   nilfs_warn(inode->i_sb,
> -"%s (ino=%" PRIino "u): entry number %llu already 
> freed",
> +"%s (ino=%llu): entry number %llu already freed",
>  __func__, inode->i_ino,
>  (unsigned long long)req->pr_entry_nr);
>   else
> @@ -748,7 +748,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,
>  
>   if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
>   nilfs_warn(inode->i_sb,
> -"%s (ino=%" PRIino "u): entry number %llu already 
> freed",
> +"%s (ino=%llu): entry number %llu already freed",
>  __func__, inode->i_ino,
>  (unsigned long long)req->pr_entry_nr);
>   else
> @@ -861,7 +861,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 
> *entry_nrs, size_t nitems)
>   if (!nilfs_clear_bit_atomic(lock, group_offset,
>   bitmap)) {
>   nilfs_warn(inode->i_sb,
> -"%s (ino=%" PRIino "u): entry number 
> %llu already freed",
> +"%s (ino=%llu): entry number %llu 
> already freed",
>  __func__, inode->i_ino,
>  (unsigned long long)entry_nrs[j]);
>   } else {
> @@ -906,7 +906,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 
> *entry_nrs, size_t nitems)
> last_nrs[k]);
>   if (ret && ret != -ENOENT)
>   nilfs_warn(inode->i_sb,
> -"error %d deleting block that object 
> (entry=%llu, ino=%" PRIino "u) belongs to",
> +"error %d deleting block that object 
> (entry=%llu, ino=%llu) belongs to",
>  ret, (unsigned long long)last_nrs[k],
>  inode->i_ino);
>   }
> @@ -923,7 +923,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 
> *entry_nrs, size_t nitems)
>   ret = nilfs_palloc_delete_bitmap_block(inode, group);
>   if (ret && ret != -ENOENT)
>   nilfs_warn(inode->i_sb,
> -"error %d deleting bitmap block of 
> group=%lu, ino=%" PRIino "u",
> +"error %d deleting bitmap block of 
> group=%lu, ino=%llu",
>  ret, group, inode->i_ino);
>   }
>   }
> diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c
> index 
> e12979bac3c3ee5eb7fcc2bf156fe6e48fc65a7d..824f2bd91c167965ec3a660202b6e6c5f1fe007e
>  100644
> --- a/fs/nilfs2/bmap.c
> +++ b/fs/nilfs2/bmap.c
> @@ -33,7 +33,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap,
>  
>   if (err == -EINVAL) {
>   __nilfs_error(inode->i_sb, fname,
> -   "broken bmap (inode number=%" PRIino "u)", 
> inode->i_ino);
> +   "broken bmap (inode number=%llu)", inode->i_ino);
>   err = -EIO;
>   }
>   return err;
> diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c
> index 
> 3d64f3a9223e5601dc2332ae6e1007edd5b4827b..2e553d698d0f3980de98fced415dfd819ddbca0a
>  100644
> --- a/fs/nilfs2/btnode.c
> +++ b/fs/nilfs2/btnode.c
> @@ -64,7 +64,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 
> blocknr)
>* clearing of an abandoned b-tree node is missing somewhere).
>*/
>   nilfs_error(inode->i_sb,
> - "state inconsistency probably due to duplicate use 
> of b-tree node block address %llu (ino=%" PRIino "u)",
> +

[PATCH v2 068/110] nilfs2: replace PRIino with %llu/%llx format strings

2026-03-03 Thread Jeff Layton 
Now that i_ino is u64 and the PRIino format macro has been removed,
replace all uses in nilfs2 with the concrete format strings.

Signed-off-by: Jeff Layton 
---
 fs/nilfs2/alloc.c   | 10 +-
 fs/nilfs2/bmap.c|  2 +-
 fs/nilfs2/btnode.c  |  2 +-
 fs/nilfs2/btree.c   | 12 ++--
 fs/nilfs2/dir.c | 12 ++--
 fs/nilfs2/direct.c  |  4 ++--
 fs/nilfs2/gcinode.c |  2 +-
 fs/nilfs2/inode.c   |  8 
 fs/nilfs2/mdt.c |  2 +-
 fs/nilfs2/namei.c   |  2 +-
 fs/nilfs2/segment.c |  2 +-
 11 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 
a3c559c86e5a4c63b1c9dd4ca137f24749c3ee87..7b1cd2baefcf21e54f9260845b02c7c95c148c64
 100644
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -707,7 +707,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode,
 
if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
nilfs_warn(inode->i_sb,
-  "%s (ino=%" PRIino "u): entry number %llu already 
freed",
+  "%s (ino=%llu): entry number %llu already freed",
   __func__, inode->i_ino,
   (unsigned long long)req->pr_entry_nr);
else
@@ -748,7 +748,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode,
 
if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
nilfs_warn(inode->i_sb,
-  "%s (ino=%" PRIino "u): entry number %llu already 
freed",
+  "%s (ino=%llu): entry number %llu already freed",
   __func__, inode->i_ino,
   (unsigned long long)req->pr_entry_nr);
else
@@ -861,7 +861,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 
*entry_nrs, size_t nitems)
if (!nilfs_clear_bit_atomic(lock, group_offset,
bitmap)) {
nilfs_warn(inode->i_sb,
-  "%s (ino=%" PRIino "u): entry number 
%llu already freed",
+  "%s (ino=%llu): entry number %llu 
already freed",
   __func__, inode->i_ino,
   (unsigned long long)entry_nrs[j]);
} else {
@@ -906,7 +906,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 
*entry_nrs, size_t nitems)
  last_nrs[k]);
if (ret && ret != -ENOENT)
nilfs_warn(inode->i_sb,
-  "error %d deleting block that object 
(entry=%llu, ino=%" PRIino "u) belongs to",
+  "error %d deleting block that object 
(entry=%llu, ino=%llu) belongs to",
   ret, (unsigned long long)last_nrs[k],
   inode->i_ino);
}
@@ -923,7 +923,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 
*entry_nrs, size_t nitems)
ret = nilfs_palloc_delete_bitmap_block(inode, group);
if (ret && ret != -ENOENT)
nilfs_warn(inode->i_sb,
-  "error %d deleting bitmap block of 
group=%lu, ino=%" PRIino "u",
+  "error %d deleting bitmap block of 
group=%lu, ino=%llu",
   ret, group, inode->i_ino);
}
}
diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c
index 
e12979bac3c3ee5eb7fcc2bf156fe6e48fc65a7d..824f2bd91c167965ec3a660202b6e6c5f1fe007e
 100644
--- a/fs/nilfs2/bmap.c
+++ b/fs/nilfs2/bmap.c
@@ -33,7 +33,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap,
 
if (err == -EINVAL) {
__nilfs_error(inode->i_sb, fname,
- "broken bmap (inode number=%" PRIino "u)", 
inode->i_ino);
+ "broken bmap (inode number=%llu)", inode->i_ino);
err = -EIO;
}
return err;
diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c
index 
3d64f3a9223e5601dc2332ae6e1007edd5b4827b..2e553d698d0f3980de98fced415dfd819ddbca0a
 100644
--- a/fs/nilfs2/btnode.c
+++ b/fs/nilfs2/btnode.c
@@ -64,7 +64,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 
blocknr)
 * clearing of an abandoned b-tree node is missing somewhere).
 */
nilfs_error(inode->i_sb,
-   "state inconsistency probably due to duplicate use 
of b-tree node block address %llu (ino=%" PRIino "u)",
+   "state inconsistency probably due to duplicate use 
of b-tree node block address %llu (ino=%llu)",
(unsigned long long)blocknr, inode->i_ino);