aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhexiaole <hexiaole@kylinos.cn>2022-07-13 20:58:24 -0500
committerEric Sandeen <sandeen@sandeen.net>2022-07-13 20:58:24 -0500
commit03bc653907cc4e89cbb45524063439800a722d9b (patch)
tree162f7ccf170bbed33b8b07b80ebbdc2b13af2dbd
parentdaebb4ce880209dd28c5cf409ce40cca72836736 (diff)
downloadxfsprogs-dev-03bc653907cc4e89cbb45524063439800a722d9b.tar.gz
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>
-rw-r--r--logprint/log_misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 5f442b1425..82e1f682fd 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -482,7 +482,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),