mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
zdump/scsi: reuse SCSI superblock struct definitions from boot_defs.h
To remove duplication of definitions. Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com> Reviewed-by: Mikhail Zaslonko <zaslonko@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
committed by
Jan Höppner
parent
446ace09ad
commit
4a8e52a019
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user