X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fnetware.c;h=4d157aaf5d4c5511ff2b0bcba92ab9bf8417f9c4;hb=064360cde8f35d8ac6faf418ddfa39b9f3da4347;hp=49afe21fc4b1b02fd9720e829d499bfca8c83185;hpb=674e00f67c5dc4bd6e7c5aff21c11b36eb81cd75;p=elogind.git

diff --git a/extras/volume_id/lib/netware.c b/extras/volume_id/lib/netware.c
index 49afe21fc..4d157aaf5 100644
--- a/extras/volume_id/lib/netware.c
+++ b/extras/volume_id/lib/netware.c
@@ -36,9 +36,49 @@ struct netware_super_block {
 	uint16_t	SBH_VersionMediaMinor;
 	uint32_t	SBH_ItemsMoved;
 	uint8_t		SBH_InternalID[16];
+	uint32_t	SBH_PackedSize;
+	uint32_t	SBH_Checksum;
+	uint32_t	supersyncid;
+	int64_t		superlocation[4];
+	uint32_t	physSizeUsed;
+	uint32_t	sizeUsed;
+	uint32_t	superTimeStamp;
+	uint32_t	reserved0[1];
+	int64_t		SBH_LoggedPoolDataBlk;
+	int64_t		SBH_PoolDataBlk;
+	uint8_t		SBH_OldInternalID[16];
+	uint32_t	SBH_PoolToLVStartUTC;
+	uint32_t	SBH_PoolToLVEndUTC;
+	uint16_t	SBH_VersionMediaMajorCreate;
+	uint16_t	SBH_VersionMediaMinorCreate;
+	uint32_t	SBH_BlocksMoved;
+	uint32_t	SBH_TempBTSpBlk;
+	uint32_t	SBH_TempFTSpBlk;
+	uint32_t	SBH_TempFTSpBlk1;
+	uint32_t	SBH_TempFTSpBlk2;
+	uint32_t 	nssMagicNumber;
+	uint32_t	poolClassID;
+	uint32_t 	poolID;
+	uint32_t	createTime;
+	int64_t		SBH_LoggedVolumeDataBlk;
+	int64_t		SBH_VolumeDataBlk;
+	int64_t		SBH_SystemBeastBlkNum;
+	uint64_t	totalblocks;
+	uint16_t 	SBH_Name[64];
+	uint8_t		SBH_VolumeID[16];
+	uint8_t		SBH_PoolID[16];
+	uint8_t		SBH_PoolInternalID[16];
+	uint64_t	SBH_Lsn;
+	uint32_t	SBH_SS_Enabled;
+	uint32_t	SBH_SS_CreateTime;
+	uint8_t		SBH_SS_OriginalPoolID[16];
+	uint8_t		SBH_SS_OriginalVolumeID[16];
+	uint8_t		SBH_SS_Guid[16];
+	uint16_t	SBH_SS_OriginalName[64];
+	uint32_t	reserved2[64-(2+46)];
 } PACKED;
 
-int volume_id_probe_netware(struct volume_id *id, uint64_t off)
+int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	struct netware_super_block *nw;
 
@@ -51,7 +91,7 @@ int volume_id_probe_netware(struct volume_id *id, uint64_t off)
 	if (memcmp(nw->SBH_Signature, "SPB5", 4) != 0)
 		return -1;
 
-	volume_id_set_uuid(id, nw->SBH_InternalID, UUID_DCE);
+	volume_id_set_uuid(id, nw->SBH_PoolID, 0, UUID_DCE);
 
 	snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%02u",
 		 le16_to_cpu(nw->SBH_VersionMediaMajor), le16_to_cpu(nw->SBH_VersionMediaMinor));