Merge tag 'acpi-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 5c706765404a85f4d097eba66da659601f8c073a..359a8e4bd44d110bc38b311aac20cf3575cbc0c4 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -14,6 +14,7 @@
 #include <linux/rcupdate.h>
 #include <linux/slab.h>
 #include <linux/percpu-refcount.h>
+#include <linux/uuid.h>
 
 #ifdef CONFIG_BLOCK
 
@@ -93,7 +94,7 @@ struct disk_stats {
  * 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
+#define PARTITION_META_INFO_UUIDLTH    (UUID_STRING_LEN + 1)
 
 struct partition_meta_info {
        char uuid[PARTITION_META_INFO_UUIDLTH];
@@ -228,27 +229,9 @@ static inline struct gendisk *part_to_disk(struct hd_struct *part)
        return NULL;
 }
 
-static inline void part_pack_uuid(const u8 *uuid_str, u8 *to)
-{
-       int i;
-       for (i = 0; i < 16; ++i) {
-               *to++ = (hex_to_bin(*uuid_str) << 4) |
-                       (hex_to_bin(*(uuid_str + 1)));
-               uuid_str += 2;
-               switch (i) {
-               case 3:
-               case 5:
-               case 7:
-               case 9:
-                       uuid_str++;
-                       continue;
-               }
-       }
-}
-
 static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
 {
-       part_pack_uuid(uuid_str, to);
+       uuid_be_to_bin(uuid_str, (uuid_be *)to);
        return 0;
 }