From 4a8e52a01921bdd6d771d56338cd767452b52cda Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Wed, 1 Jun 2022 07:03:09 +0200 Subject: [PATCH] zdump/scsi: reuse SCSI superblock struct definitions from boot_defs.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To remove duplication of definitions. Signed-off-by: Alexander Egorenkov Reviewed-by: Mikhail Zaslonko Signed-off-by: Jan Höppner --- zdump/dt_scsi.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/zdump/dt_scsi.c b/zdump/dt_scsi.c index 5977cd2a..92238856 100644 --- a/zdump/dt_scsi.c +++ b/zdump/dt_scsi.c @@ -21,21 +21,6 @@ #include "zg.h" #include "dt.h" -/* - * Single volume SCSI dump superblock - */ -struct scsi_dump_sb { - uint64_t magic; - uint64_t version; - uint64_t part_start; - uint64_t part_size; - uint64_t dump_off; - uint64_t dump_size; - uint64_t csum_off; - uint64_t csum_size; - uint64_t csum; -} __packed; - /* * File local static data */ @@ -131,14 +116,14 @@ static int check_sb(void) { char buf[l.sb.csum_size]; - if (l.sb.magic != 0x5a46435044554d50ULL) /* ZFCPDUMP */ + if (l.sb.magic != SCSI_DUMP_SB_MAGIC) return -1; /* * Verify checksum */ - zg_seek(g.fh, l.sb.part_start + l.sb.csum_off, ZG_CHECK); + zg_seek(g.fh, l.sb.part_start + l.sb.csum_offset, ZG_CHECK); zg_read(g.fh, &buf, sizeof(buf), ZG_CHECK); - if (zg_csum_partial(&buf, l.sb.csum_size, 0x12345678) != l.sb.csum) + if (zg_csum_partial(&buf, l.sb.csum_size, SCSI_DUMP_SB_SEED) != l.sb.csum) return -1; return 0; }