From e69ff279fa8e098d00663248c399240fabef0c45 Mon Sep 17 00:00:00 2001
From: Hadrien Copponnex <hadri.coppo@gmail.com>
Date: Thu, 8 Nov 2018 11:18:13 +0100
Subject: [PATCH] Fixed xattr.h includes

---
 cmd_migrate.c              | 2 +-
 include/uapi/linux/xattr.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmd_migrate.c b/cmd_migrate.c
index 9523dbdd..497a4182 100644
--- a/cmd_migrate.c
+++ b/cmd_migrate.c
@@ -3,13 +3,13 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <string.h>
+#include <sys/xattr.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 #include <unistd.h>
-#include <attr/xattr.h>
 
 #include <linux/fiemap.h>
 #include <linux/fs.h>
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
index c95882b3..1590c49c 100644
--- a/include/uapi/linux/xattr.h
+++ b/include/uapi/linux/xattr.h
@@ -13,8 +13,12 @@
 #ifndef _UAPI_LINUX_XATTR_H
 #define _UAPI_LINUX_XATTR_H
 
+#if __UAPI_DEF_XATTR
+#define __USE_KERNEL_XATTR_DEFS
+
 #define XATTR_CREATE	0x1	/* set value, fail if attr already exists */
 #define XATTR_REPLACE	0x2	/* set value, fail if attr does not exist */
+#endif
 
 /* Namespaces */
 #define XATTR_OS2_PREFIX "os2."