From: Christoph Hellwig Date: Fri, 2 Mar 2012 08:35:22 +0000 (+0000) Subject: repair: fix messages from set_nlinks X-Git-Tag: v3.1.8~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=154d3b3381d8b3b3a7726f8a43b5a2bde8b4b1b0;p=thirdparty%2Fxfsprogs-dev.git repair: fix messages from set_nlinks Link counts are unsigned and need to be printed as such. Also only print the varning about upgrading the inode version if the inode was version 1 before. Reviewed-by: Dave Chinner Signed-off-by: Christoph Hellwig --- diff --git a/repair/phase7.c b/repair/phase7.c index 8c1131c90..bd1668e13 100644 --- a/repair/phase7.c +++ b/repair/phase7.c @@ -40,19 +40,20 @@ set_nlinks( if (!no_modify) { *dirty = 1; - do_warn(_("resetting inode %" PRIu64 " nlinks from %d to %d\n"), + do_warn(_("resetting inode %" PRIu64 " nlinks from %u to %u\n"), ino, dinoc->di_nlink, nrefs); - if (nrefs > XFS_MAXLINK_1) { + if (dinoc->di_version == 1 && nrefs > XFS_MAXLINK_1) { ASSERT(fs_inode_nlink); do_warn( -_("nlinks %d will overflow v1 ino, ino %" PRIu64 " will be converted to version 2\n"), +_("nlinks %u will overflow v1 ino, ino %" PRIu64 " will be converted to version 2\n"), nrefs, ino); } dinoc->di_nlink = nrefs; } else { - do_warn(_("would have reset inode %" PRIu64 " nlinks from %d to %d\n"), + do_warn( +_("would have reset inode %" PRIu64 " nlinks from %u to %u\n"), ino, dinoc->di_nlink, nrefs); } }