From: Chandan Babu R <chandan.babu@oracle.com>
Date: Mon, 6 Nov 2023 13:10:39 +0000 (+0530)
Subject: metadump: Postpone invocation of init_metadump()
X-Git-Tag: v6.6.0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e4702774a2d1e78d81cb63b5f4338625ea7cea2;p=thirdparty%2Fxfsprogs-dev.git

metadump: Postpone invocation of init_metadump()

The metadump v2 initialization function (introduced in a later commit) writes
the header structure into the metadump file. This will require the program to
open the metadump file before the initialization function has been invoked.

Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
---

diff --git a/db/metadump.c b/db/metadump.c
index 8d921500d..24f0b41fd 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2805,10 +2805,6 @@ metadump_f(
 		pop_cur();
 	}
 
-	ret = init_metadump();
-	if (ret)
-		return 0;
-
 	start_iocur_sp = iocur_sp;
 
 	if (strcmp(argv[optind], "-") == 0) {
@@ -2853,6 +2849,10 @@ metadump_f(
 		}
 	}
 
+	ret = init_metadump();
+	if (ret)
+		goto out;
+
 	exitcode = 0;
 
 	for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
@@ -2890,8 +2890,9 @@ metadump_f(
 	/* cleanup iocur stack */
 	while (iocur_sp > start_iocur_sp)
 		pop_cur();
-out:
+
 	release_metadump();
 
+out:
 	return 0;
 }