Blame btrfs-ioctl-fix.patch
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
This was reported when docker failed to build against
|
|
Eric Sandeen |
5ffe7f |
btrfs-progs v4.8.1.
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
It includes ioctl.h which now calls BUILD_ASSERT(), which
|
|
Eric Sandeen |
5ffe7f |
is defined in kerncompat.h, which was not included in the
|
|
Eric Sandeen |
5ffe7f |
ioctl.h header file.
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
|
Eric Sandeen |
5ffe7f |
---
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
diff --git a/ioctl.h b/ioctl.h
|
|
Eric Sandeen |
5ffe7f |
index a7235c0..abea7ed 100644
|
|
Eric Sandeen |
5ffe7f |
--- a/ioctl.h
|
|
Eric Sandeen |
5ffe7f |
+++ b/ioctl.h
|
|
Eric Sandeen |
5ffe7f |
@@ -26,6 +26,12 @@ extern "C" {
|
|
Eric Sandeen |
5ffe7f |
#include <asm/types.h>
|
|
Eric Sandeen |
5ffe7f |
#include <linux/ioctl.h>
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
+#if BTRFS_FLAT_INCLUDES
|
|
Eric Sandeen |
5ffe7f |
+#include "kerncompat.h"
|
|
Eric Sandeen |
5ffe7f |
+#else
|
|
Eric Sandeen |
5ffe7f |
+#include <btrfs/kerncompat.h>
|
|
Eric Sandeen |
5ffe7f |
+#endif /* BTRFS_FLAT_INCLUDES */
|
|
Eric Sandeen |
5ffe7f |
+
|
|
Eric Sandeen |
5ffe7f |
#ifndef __user
|
|
Eric Sandeen |
5ffe7f |
#define __user
|
|
Eric Sandeen |
5ffe7f |
#endif
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
--
|
|
Eric Sandeen |
5ffe7f |
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
|
|
Eric Sandeen |
5ffe7f |
the body of a message to majordomo@vger.kernel.org
|
|
Eric Sandeen |
5ffe7f |
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
|
Eric Sandeen |
5ffe7f |
|
|
Eric Sandeen |
5ffe7f |
|