1 files changed, 6 insertions, 2 deletions

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 4f440b3e89fe..79b8bba19363 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -88,10 +88,14 @@ struct disk_stats {
 };
 
 #define PARTITION_META_INFO_VOLNAMELTH  64
-#define PARTITION_META_INFO_UUIDLTH     16
+/*
+ * Enough for the string representation of any kind of UUID plus NULL.
+ * EFI UUID is 36 characters. MSDOS UUID is 11 characters.
+ */
+#define PARTITION_META_INFO_UUIDLTH     37
 
 struct partition_meta_info {
-        u8 uuid[PARTITION_META_INFO_UUIDLTH];   /* always big endian */
+        char uuid[PARTITION_META_INFO_UUIDLTH];
         u8 volname[PARTITION_META_INFO_VOLNAMELTH];
 };