All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chandan Babu R <chandan.babu@oracle.com>
To: cem@kernel.org
Cc: Chandan Babu R <chandan.babu@oracle.com>, linux-xfs@vger.kernel.org
Subject: [PATCH 20/24] mdrestore: Detect metadump version from metadump image
Date: Tue, 23 May 2023 14:30:46 +0530	[thread overview]
Message-ID: <20230523090050.373545-21-chandan.babu@oracle.com> (raw)
In-Reply-To: <20230523090050.373545-1-chandan.babu@oracle.com>

Signed-off-by: Chandan Babu R <chandan.babu@oracle.com>
---
 mdrestore/xfs_mdrestore.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 5ec1a47b0..52081a6ca 100644
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -8,7 +8,7 @@
 #include "xfs_metadump.h"
 
 struct mdrestore_ops {
-	void (*read_header)(void *header, FILE *mdfp);
+	int (*read_header)(void *header, FILE *mdfp);
 	void (*show_info)(void *header, const char *mdfile);
 	void (*restore)(void *header, FILE *mdfp, int data_fd,
 			bool is_target_file);
@@ -86,7 +86,7 @@ open_device(
 	return fd;
 }
 
-static void
+static int
 read_header_v1(
 	void			*header,
 	FILE			*mdfp)
@@ -96,7 +96,9 @@ read_header_v1(
 	if (fread(mb, sizeof(*mb), 1, mdfp) != 1)
 		fatal("error reading from metadump file\n");
 	if (mb->mb_magic != cpu_to_be32(XFS_MD_MAGIC_V1))
-		fatal("specified file is not a metadata dump\n");
+		return -1;
+
+	return 0;
 }
 
 static void
@@ -316,9 +318,10 @@ main(
 			fatal("cannot open source dump file\n");
 	}
 
-	mdrestore.mdrops = &mdrestore_ops_v1;
-
-	mdrestore.mdrops->read_header(&mb, src_f);
+	if (mdrestore_ops_v1.read_header(&mb, src_f) == 0)
+		mdrestore.mdrops = &mdrestore_ops_v1;
+	else
+		fatal("Invalid metadump format\n");
 
 	if (mdrestore.show_info) {
 		mdrestore.mdrops->show_info(&mb, argv[optind]);
-- 
2.39.1


  parent reply	other threads:[~2023-05-23  9:01 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-23  9:00 [PATCH 00/24] Metadump v2 Chandan Babu R
2023-05-23  9:00 ` [PATCH 01/24] metadump: Use boolean values true/false instead of 1/0 Chandan Babu R
2023-05-23 16:31   ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 02/24] mdrestore: Fix logic used to check if target device is large enough Chandan Babu R
2023-05-23 16:32   ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 03/24] metadump: Define and use struct metadump Chandan Babu R
2023-05-23 16:35   ` Darrick J. Wong
2023-05-24  4:50     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 04/24] metadump: Add initialization and release functions Chandan Babu R
2023-05-23 16:36   ` Darrick J. Wong
2023-05-24  5:03     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 05/24] set_cur: Add support to read from external log device Chandan Babu R
2023-05-23 16:48   ` Darrick J. Wong
2023-05-25  8:27     ` Chandan Babu R
2023-06-05  9:19     ` Chandan Babu R
2023-06-05 19:22       ` Darrick J. Wong
2023-06-06  4:47         ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 06/24] metadump: Dump external log device contents Chandan Babu R
2023-05-23 17:02   ` Darrick J. Wong
2023-05-26  6:54     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 07/24] metadump: Postpone invocation of init_metadump() Chandan Babu R
2023-05-23 17:13   ` Darrick J. Wong
2023-05-25  8:45     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 08/24] metadump: Introduce struct metadump_ops Chandan Babu R
2023-05-23 17:15   ` Darrick J. Wong
2023-05-25  8:48     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 09/24] metadump: Introduce metadump v1 operations Chandan Babu R
2023-05-23 17:25   ` Darrick J. Wong
2023-05-25 14:19     ` Chandan Babu R
2023-06-02 14:34       ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 10/24] metadump: Rename XFS_MD_MAGIC to XFS_MD_MAGIC_V1 Chandan Babu R
2023-05-23 17:27   ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 11/24] metadump: Define metadump v2 ondisk format structures and macros Chandan Babu R
2023-05-23 17:34   ` Darrick J. Wong
2023-05-25  9:26     ` Chandan Babu R
2023-06-02 14:46       ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 12/24] metadump: Define metadump ops for v2 format Chandan Babu R
2023-05-23 17:37   ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 13/24] metadump: Add support for passing version option Chandan Babu R
2023-05-23 17:41   ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 14/24] xfs_metadump.sh: " Chandan Babu R
2023-05-23 17:39   ` Darrick J. Wong
2023-05-25  9:31     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 15/24] xfs_metadump.8: Add description for the newly introduced -v option Chandan Babu R
2023-05-23 17:40   ` Darrick J. Wong
2023-05-25 10:04     ` Chandan Babu R
2023-06-02 14:58       ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 16/24] mdrestore: Define and use struct mdrestore Chandan Babu R
2023-05-23 17:42   ` Darrick J. Wong
2023-05-26  8:38     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 17/24] mdrestore: Add open_device(), read_header() and show_info() functions Chandan Babu R
2023-05-23 17:44   ` Darrick J. Wong
2023-05-25 10:11     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 18/24] mdrestore: Introduce struct mdrestore_ops Chandan Babu R
2023-05-23 17:44   ` Darrick J. Wong
2023-05-25 10:34     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 19/24] mdrestore: Introduce mdrestore v1 operations Chandan Babu R
2023-05-23 17:48   ` Darrick J. Wong
2023-05-25 10:39     ` Chandan Babu R
2023-05-23  9:00 ` Chandan Babu R [this message]
2023-05-23 18:11   ` [PATCH 20/24] mdrestore: Detect metadump version from metadump image Darrick J. Wong
2023-05-23  9:00 ` [PATCH 21/24] mdrestore: Extract target device size verification into a function Chandan Babu R
2023-05-23 18:07   ` Darrick J. Wong
2023-05-25 12:02     ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 22/24] mdrestore: Define mdrestore ops for v2 format Chandan Babu R
2023-05-23 18:06   ` Darrick J. Wong
2023-05-25 12:10     ` Chandan Babu R
2023-06-02 15:01       ` Darrick J. Wong
2023-05-23  9:00 ` [PATCH 23/24] mdrestore: Add support for passing log device as an argument Chandan Babu R
2023-05-23 18:09   ` Darrick J. Wong
2023-05-25 13:43     ` Chandan Babu R
2023-06-02 15:02       ` Darrick J. Wong
2023-06-05  6:19         ` Chandan Babu R
2023-05-23  9:00 ` [PATCH 24/24] xfs_mdrestore.8: Add description for the newly introduced -l option Chandan Babu R
2023-05-23 18:10   ` Darrick J. Wong
2023-05-25 13:45     ` Chandan Babu R

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230523090050.373545-21-chandan.babu@oracle.com \
    --to=chandan.babu@oracle.com \
    --cc=cem@kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.