From 14e40dbe957af4a77153d612673cd827f7432813 Mon Sep 17 00:00:00 2001 From: Barry Naujok Date: Mon, 30 Oct 2006 14:48:15 +0000 Subject: [PATCH] Fixed an endian based flaw in setting the old nlink count in phase 7 of xfs_repair Merge of master-melb:xfs-cmds:27311a by kenmcd. Updated xfsprogs to 2.8.16 --- VERSION | 2 +- doc/CHANGES | 3 +++ repair/phase7.c | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 23a00e0ba..3f020aa80 100644 --- a/VERSION +++ b/VERSION @@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=8 -PKG_REVISION=15 +PKG_REVISION=16 PKG_BUILD=1 diff --git a/doc/CHANGES b/doc/CHANGES index 11d472f9e..cf8986f8e 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +xfsprogs-2.8.16 (30 October 2006) + - Fix up an endian problem for nlink setting in phase 7 for xfs_repair. + xfsprogs-2.8.15 (19 October 2006) - Fix up nlink checks and repairs in phase 7 for xfs_repair. - Remove a bogus LEAFN warning for a single leaf node v2 dir. diff --git a/repair/phase7.c b/repair/phase7.c index 4aaa12c64..b656725e2 100644 --- a/repair/phase7.c +++ b/repair/phase7.c @@ -180,11 +180,12 @@ phase7_alt_function(xfs_mount_t *mp, xfs_agnumber_t agno) if (!XFS_SB_VERSION_HASNLINK(&mp->m_sb)) { ASSERT(dip->di_core.di_nlink <= XFS_MAXLINK_1); + INT_SET(dip->di_core.di_onlink, + ARCH_CONVERT, + dip->di_core.di_nlink); dip->di_core.di_nlink = INT_GET(dip->di_core.di_nlink, ARCH_CONVERT); - dip->di_core.di_onlink = - dip->di_core.di_nlink; } else { /* superblock support v2 nlinks */ INT_SET(dip->di_core.di_version, -- 2.47.2