[PATCH 8/14] xfsprogs: fix issues with e0607266f23

[Ben Myers]

A couple of issues found in review.

Signed-off-by: Ben Myers <bpm at sgi.com>

---
 libxfs/xfs_alloc.c |    9 ++-------
 repair/dinode.c    |    9 +++------
 2 files changed, 5 insertions(+), 13 deletions(-)

Index: b/libxfs/xfs_alloc.c
===================================================================
--- a/libxfs/xfs_alloc.c	2013-08-06 14:42:30.200817922 -0500
+++ b/libxfs/xfs_alloc.c	2013-08-06 14:42:39.090877575 -0500
@@ -2173,13 +2173,8 @@ xfs_agf_verify(
 	struct xfs_agf	*agf = XFS_BUF_TO_AGF(bp);
 
 	if (xfs_sb_version_hascrc(&mp->m_sb) &&
-	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_uuid)) {
-		char uu[64], uu2[64];
-		platform_uuid_unparse(&agf->agf_uuid, uu);
-		platform_uuid_unparse(&mp->m_sb.sb_uuid, uu2);
-
-			return false;
-	}
+	    !uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_uuid))
+		return false;
 
 	if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&
 	      XFS_AGF_GOOD_VERSION(be32_to_cpu(agf->agf_versionnum)) &&
Index: b/repair/dinode.c
===================================================================
--- a/repair/dinode.c	2013-08-06 14:43:09.910817602 -0500
+++ b/repair/dinode.c	2013-08-06 14:44:49.660857353 -0500
@@ -182,12 +182,9 @@ clear_dinode_core(struct xfs_mount *mp, 
 		platform_uuid_copy(&dinoc->di_uuid, &mp->m_sb.sb_uuid);
 	}
 
-	for (i = 0; i < 16; i++) {
-		if (dinoc->di_pad[i] != 0) {
-			__dirty_no_modify_ret(dirty);
-			memset(dinoc->di_pad, 0, 16);
-			break;
-		}
+	if (dinoc->di_pad2 != 0) {
+		__dirty_no_modify_ret(dirty);
+		dinoc->di_pad2 = 0;
 	}
 
 	if (be64_to_cpu(dinoc->di_flags2) != 0)  {