df76fdec2d
Backport from kernel xfsprogs git: This correction has already been merged into kernel xfsprogs git: Link: https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?h=for-next&id=03bc653907cc4e89cbb45524063439800a722d9b and the original discussion for this patch can be found: Link: https://marc.info/?l=linux-xfs&m=165642746415368&w=2 Signed-off-by: Xiaole He <hexiaole@kylinos.cn>
70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
From 8f9d8d38f2c4cea10d82d62286e6caa837d1bfd6 Mon Sep 17 00:00:00 2001
|
|
From: hexiaole <hexiaole@kylinos.cn>
|
|
Date: Wed, 13 Jul 2022 20:58:24 -0500
|
|
Subject: [PATCH] xfs: correct nlink printf specifier from hd to PRIu32
|
|
|
|
1. Description
|
|
libxfs/xfs_log_format.h declare 'di_nlink' as unsigned 32-bit integer:
|
|
|
|
typedef struct xfs_icdinode {
|
|
...
|
|
__uint32_t di_nlink; /* number of links to file */
|
|
...
|
|
} xfs_icdinode_t;
|
|
|
|
But logprint/log_misc.c use '%hd' to print 'di_nlink':
|
|
|
|
void
|
|
xlog_print_trans_inode_core(xfs_icdinode_t *ip)
|
|
{
|
|
...
|
|
printf(_("nlink %hd uid %d gid %d\n"),
|
|
ip->di_nlink, ip->di_uid, ip->di_gid);
|
|
...
|
|
}
|
|
|
|
'%hd' can be 16-bit on many architectures, on these architectures, the 'printf' only print the low 16-bit of 'di_nlink'.
|
|
|
|
2. Reproducer
|
|
2.1. Commands
|
|
[root@localhost ~]# cd
|
|
[root@localhost ~]# xfs_mkfile 128m 128m.xfs
|
|
[root@localhost ~]# mkfs.xfs 128m.xfs
|
|
[root@localhost ~]# mount 128m.xfs /mnt/
|
|
[root@localhost ~]# cd /mnt/
|
|
[root@localhost mnt]# seq 1 65534|xargs mkdir -p
|
|
[root@localhost mnt]# cd
|
|
[root@localhost ~]# umount /mnt/
|
|
[root@localhost ~]# xfs_logprint 128m.xfs|grep nlink|tail -1
|
|
|
|
2.2. Expect result
|
|
nlink 65536
|
|
|
|
2.3. Actual result
|
|
nlink 0
|
|
|
|
Signed-off-by: hexiaole <hexiaole@kylinos.cn>
|
|
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
|
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
|
---
|
|
logprint/log_misc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
|
|
index 35e926a..6add28e 100644
|
|
--- a/logprint/log_misc.c
|
|
+++ b/logprint/log_misc.c
|
|
@@ -444,7 +444,7 @@ xlog_print_trans_inode_core(
|
|
printf(_("magic 0x%hx mode 0%ho version %d format %d\n"),
|
|
ip->di_magic, ip->di_mode, (int)ip->di_version,
|
|
(int)ip->di_format);
|
|
- printf(_("nlink %hd uid %d gid %d\n"),
|
|
+ printf(_("nlink %" PRIu32 " uid %d gid %d\n"),
|
|
ip->di_nlink, ip->di_uid, ip->di_gid);
|
|
printf(_("atime 0x%llx mtime 0x%llx ctime 0x%llx\n"),
|
|
xlog_extract_dinode_ts(ip->di_atime),
|
|
--
|
|
2.27.0
|
|
|