diff options
author | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
commit | fdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch) | |
tree | ca1a216730e32471cd17886d9de1902228bc340c /block/partitions/ldm.h | |
parent | f06345add95f388519e83ec398134853e0f64ac9 (diff) | |
parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
download | linux-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.tar.bz2 |
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'block/partitions/ldm.h')
-rw-r--r-- | block/partitions/ldm.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/partitions/ldm.h b/block/partitions/ldm.h index 374242c0971a..f4c6055df956 100644 --- a/block/partitions/ldm.h +++ b/block/partitions/ldm.h @@ -112,8 +112,6 @@ struct frag { /* VBLK Fragment handling */ /* In memory LDM database structures. */ -#define GUID_SIZE 16 - struct privhead { /* Offsets and sizes are in sectors. */ u16 ver_major; u16 ver_minor; @@ -121,7 +119,7 @@ struct privhead { /* Offsets and sizes are in sectors. */ u64 logical_disk_size; u64 config_start; u64 config_size; - u8 disk_id[GUID_SIZE]; + uuid_t disk_id; }; struct tocblock { /* We have exactly two bitmaps. */ @@ -154,7 +152,7 @@ struct vblk_dgrp { /* VBLK Disk Group */ }; struct vblk_disk { /* VBLK Disk */ - u8 disk_id[GUID_SIZE]; + uuid_t disk_id; u8 alt_name[128]; }; |