From: Brian Foster <bfoster@redhat.com>
Date: Tue, 24 Feb 2015 00:19:31 +0000 (+1100)
Subject: metadump: include NULLFSINO check in inode copy code
X-Git-Tag: v3.2.3-rc1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39fe84affd9c3773235fc66f7050c43babc125b8;p=thirdparty%2Fxfsprogs-dev.git

metadump: include NULLFSINO check in inode copy code

The copy_ino() function includes a check for effectively NULL inode
numbers. It checks for 0 but does not include NULLFSINO. This leads to
spurious warnings in some instances. For example, copy_ino() is called
unconditionally for sb quota inodes from copy_sb_inodes(), values of
which can be NULLFSINO.

Check for NULLFSINO and return quietly from copy_ino().

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/db/metadump.c b/db/metadump.c
index 38cd441cb..6bd10a8a8 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2112,7 +2112,7 @@ copy_ino(
 	int			offset;
 	int			rval = 0;
 
-	if (ino == 0)
+	if (ino == 0 || ino == NULLFSINO)
 		return 1;
 
 	agno = XFS_INO_TO_AGNO(mp, ino);