projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
genhd.h
diff --git
a/include/linux/genhd.h
b/include/linux/genhd.h
index 79b8bba193635c94e7318d552c3e5437062bc203..9f3c275e053efbb8a723917cc85407b528431ae1 100644
(file)
--- a/
include/linux/genhd.h
+++ b/
include/linux/genhd.h
@@
-231,6
+231,12
@@
static inline void part_pack_uuid(const u8 *uuid_str, u8 *to)
}
}
}
}
+static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
+{
+ part_pack_uuid(uuid_str, to);
+ return 0;
+}
+
static inline int disk_max_parts(struct gendisk *disk)
{
if (disk->flags & GENHD_FL_EXT_DEVT)
static inline int disk_max_parts(struct gendisk *disk)
{
if (disk->flags & GENHD_FL_EXT_DEVT)
@@
-718,6
+724,10
@@
static inline dev_t blk_lookup_devt(const char *name, int partno)
return devt;
}
return devt;
}
+static inline int blk_part_pack_uuid(const u8 *uuid_str, u8 *to)
+{
+ return -EINVAL;
+}
#endif /* CONFIG_BLOCK */
#endif /* _LINUX_GENHD_H */
#endif /* CONFIG_BLOCK */
#endif /* _LINUX_GENHD_H */