From: Eric Sandeen <sandeen@sandeen.net>
Date: Wed, 29 Jul 2015 23:17:43 +0000 (+1000)
Subject: metadump: Copy the log if not obfuscating or zeroing
X-Git-Tag: v3.2.4~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75333d298210586eb7730ed4c5838df7bd786a99;p=thirdparty%2Fxfsprogs-dev.git

metadump: Copy the log if not obfuscating or zeroing

If we're not obfuscating and we're not zeroing out
stale data, we're collecting maximal information.  Keep
even a clean log intact in that case as well.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/db/metadump.c b/db/metadump.c
index 67d254567..cd2edf056 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2207,8 +2207,8 @@ copy_log(void)
 		return !stop_on_read_error;
 	}
 
-	/* If not obfuscating, just copy the log as it is */
-	if (!obfuscate)
+	/* If not obfuscating or zeroing, just copy the log as it is */
+	if (!obfuscate && !zero_stale_data)
 		goto done;
 
 	dirty = xlog_is_dirty(mp, &x, 0);