* [PATCH] btrfs-progs: fix build for programs including ioctl.h
@ 2016-10-13 17:36 Eric Sandeen
2016-10-28 2:54 ` Eric Sandeen
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sandeen @ 2016-10-13 17:36 UTC (permalink / raw)
To: linux-btrfs@vger.kernel.org
This was reported when docker failed to build against
btrfs-progs v4.8.1.
It includes ioctl.h which now calls BUILD_ASSERT(), which
is defined in kerncompat.h, which was not included in the
ioctl.h header file.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
diff --git a/ioctl.h b/ioctl.h
index a7235c0..abea7ed 100644
--- a/ioctl.h
+++ b/ioctl.h
@@ -26,6 +26,12 @@ extern "C" {
#include <asm/types.h>
#include <linux/ioctl.h>
+#if BTRFS_FLAT_INCLUDES
+#include "kerncompat.h"
+#else
+#include <btrfs/kerncompat.h>
+#endif /* BTRFS_FLAT_INCLUDES */
+
#ifndef __user
#define __user
#endif
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs-progs: fix build for programs including ioctl.h
2016-10-13 17:36 [PATCH] btrfs-progs: fix build for programs including ioctl.h Eric Sandeen
@ 2016-10-28 2:54 ` Eric Sandeen
2016-10-28 12:23 ` Eric Sandeen
0 siblings, 1 reply; 3+ messages in thread
From: Eric Sandeen @ 2016-10-28 2:54 UTC (permalink / raw)
To: linux-btrfs@vger.kernel.org
On 10/13/16 12:36 PM, Eric Sandeen wrote:
> This was reported when docker failed to build against
> btrfs-progs v4.8.1.
>
> It includes ioctl.h which now calls BUILD_ASSERT(), which
> is defined in kerncompat.h, which was not included in the
> ioctl.h header file.
Ping?
-Eric
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
>
> diff --git a/ioctl.h b/ioctl.h
> index a7235c0..abea7ed 100644
> --- a/ioctl.h
> +++ b/ioctl.h
> @@ -26,6 +26,12 @@ extern "C" {
> #include <asm/types.h>
> #include <linux/ioctl.h>
>
> +#if BTRFS_FLAT_INCLUDES
> +#include "kerncompat.h"
> +#else
> +#include <btrfs/kerncompat.h>
> +#endif /* BTRFS_FLAT_INCLUDES */
> +
> #ifndef __user
> #define __user
> #endif
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs-progs: fix build for programs including ioctl.h
2016-10-28 2:54 ` Eric Sandeen
@ 2016-10-28 12:23 ` Eric Sandeen
0 siblings, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2016-10-28 12:23 UTC (permalink / raw)
To: linux-btrfs@vger.kernel.org
On 10/27/16 9:54 PM, Eric Sandeen wrote:
> On 10/13/16 12:36 PM, Eric Sandeen wrote:
>> This was reported when docker failed to build against
>> btrfs-progs v4.8.1.
>>
>> It includes ioctl.h which now calls BUILD_ASSERT(), which
>> is defined in kerncompat.h, which was not included in the
>> ioctl.h header file.
>
> Ping?
Oh sorry I see it's in, I had searched by author and missed it.
Thanks,
-Eric
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-28 12:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-13 17:36 [PATCH] btrfs-progs: fix build for programs including ioctl.h Eric Sandeen
2016-10-28 2:54 ` Eric Sandeen
2016-10-28 12:23 ` Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).