Page MenuHomeFreeBSD
Files F152955910

D56448.id175715.diff
No OneTemporary
Actions

D56448.id175715.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/uuid.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/uuid.h
+++ sys/compat/linuxkpi/common/include/linux/uuid.h
@@ -33,6 +33,7 @@
#include <linux/random.h>
+#define UUID_SIZE 16
#define UUID_STRING_LEN 36
#define GUID_INIT(x0_3, x4_5, x6_7, x8, x9, x10, x11, x12, x13, x14, x15) \
@@ -59,6 +60,8 @@
char x[16];
} guid_t;
+extern const guid_t guid_null;
+
static inline void
guid_gen(guid_t *g)
{
@@ -68,10 +71,34 @@
g->x[8] = (g->x[8] & 0x3f) | 0x80;
}
+static inline bool
+guid_equal(const guid_t *u1, const guid_t *u2)
+{
+ return (memcmp(u1, u2, sizeof(guid_t)) == 0);
+}
+
static inline void
guid_copy(guid_t *dst, const guid_t *src)
{
memcpy(dst, src, sizeof(*dst));
}
+static inline void
+import_guid(guid_t *dst, const uint8_t *src)
+{
+ memcpy(dst, src, sizeof(guid_t));
+}
+
+static inline void
+export_guid(uint8_t *dst, const guid_t *src)
+{
+ memcpy(dst, src, sizeof(guid_t));
+}
+
+static inline bool
+guid_is_null(const guid_t *guid)
+{
+ return (guid_equal(guid, &guid_null));
+}
+
#endif /* _LINUXKPI_LINUX_UUID_H */
Index: sys/compat/linuxkpi/common/src/linux_compat.c
===================================================================
--- sys/compat/linuxkpi/common/src/linux_compat.c
+++ sys/compat/linuxkpi/common/src/linux_compat.c
@@ -98,6 +98,7 @@
#include <linux/interval_tree_generic.h>
#include <linux/printk.h>
#include <linux/seq_file.h>
+#include <linux/uuid.h>
#if defined(__i386__) || defined(__amd64__)
#include <asm/smp.h>
@@ -164,6 +165,8 @@
wait_queue_head_t linux_bit_waitq;
wait_queue_head_t linux_var_waitq;
+const guid_t guid_null;
+
int
panic_cmp(struct rb_node *one, struct rb_node *two)
{

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 19, 7:47 AM (7 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31750223
Default Alt Text
D56448.id175715.diff (1 KB)

Event Timeline