| Message ID | 343f2d64-948b-9653-18eb-76ae2e852b88@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 > -- 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
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 -- 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
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
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> --- -- 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