| Message ID | 1584466534-13248-1-git-send-email-alan.maguire@oracle.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | arch/um: falloc.h needs to be directly included for older libc | expand |
On Tue, Mar 17, 2020 at 10:38 AM Alan Maguire <alan.maguire@oracle.com> wrote: > > When building UML with glibc 2.17 installed, compilation > of arch/um/os-Linux/file.c fails due to failure to find > FALLOC_FL_PUNCH_HOLE and FALLOC_FL_KEEP_SIZE definitions. > > It appears that /usr/include/bits/fcntl-linux.h (indirectly > included by /usr/include/fcntl.h) does not include falloc.h > with an older glibc, whereas a more up-to-date version > does. > > Adding the direct include to file.c resolves the issue > and does not cause problems for more recent glibc. > > Fixes: 50109b5a03b4 ("um: Add support for DISCARD in the UBD Driver") > Cc: Brendan Higgins <brendanhiggins@google.com> > Signed-off-by: Alan Maguire <alan.maguire@oracle.com> Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
On 17/03/2020 17:35, Alan Maguire wrote: > When building UML with glibc 2.17 installed, compilation > of arch/um/os-Linux/file.c fails due to failure to find > FALLOC_FL_PUNCH_HOLE and FALLOC_FL_KEEP_SIZE definitions. > > It appears that /usr/include/bits/fcntl-linux.h (indirectly > included by /usr/include/fcntl.h) does not include falloc.h > with an older glibc, whereas a more up-to-date version > does. > > Adding the direct include to file.c resolves the issue > and does not cause problems for more recent glibc. > > Fixes: 50109b5a03b4 ("um: Add support for DISCARD in the UBD Driver") > Cc: Brendan Higgins <brendanhiggins@google.com> > Signed-off-by: Alan Maguire <alan.maguire@oracle.com> > --- > arch/um/os-Linux/file.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c > index fbda105..5c819f8 100644 > --- a/arch/um/os-Linux/file.c > +++ b/arch/um/os-Linux/file.c > @@ -8,6 +8,7 @@ > #include <errno.h> > #include <fcntl.h> > #include <signal.h> > +#include <linux/falloc.h> > #include <sys/ioctl.h> > #include <sys/mount.h> > #include <sys/socket.h> > Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
On Fri, Mar 20, 2020 at 4:58 PM Anton Ivanov <anton.ivanov@cambridgegreys.com> wrote: > > > > On 17/03/2020 17:35, Alan Maguire wrote: > > When building UML with glibc 2.17 installed, compilation > > of arch/um/os-Linux/file.c fails due to failure to find > > FALLOC_FL_PUNCH_HOLE and FALLOC_FL_KEEP_SIZE definitions. > > > > It appears that /usr/include/bits/fcntl-linux.h (indirectly > > included by /usr/include/fcntl.h) does not include falloc.h > > with an older glibc, whereas a more up-to-date version > > does. > > > > Adding the direct include to file.c resolves the issue > > and does not cause problems for more recent glibc. > > > > Fixes: 50109b5a03b4 ("um: Add support for DISCARD in the UBD Driver") > > Cc: Brendan Higgins <brendanhiggins@google.com> > > Signed-off-by: Alan Maguire <alan.maguire@oracle.com> > > --- > > arch/um/os-Linux/file.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c > > index fbda105..5c819f8 100644 > > --- a/arch/um/os-Linux/file.c > > +++ b/arch/um/os-Linux/file.c > > @@ -8,6 +8,7 @@ > > #include <errno.h> > > #include <fcntl.h> > > #include <signal.h> > > +#include <linux/falloc.h> > > #include <sys/ioctl.h> > > #include <sys/mount.h> > > #include <sys/socket.h> > > > > Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com> Applied, thanks! BTW: Anton & Brendan, thanks a lot for reviewing all these patches!
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index fbda105..5c819f8 100644 --- a/arch/um/os-Linux/file.c +++ b/arch/um/os-Linux/file.c @@ -8,6 +8,7 @@ #include <errno.h> #include <fcntl.h> #include <signal.h> +#include <linux/falloc.h> #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/socket.h>
When building UML with glibc 2.17 installed, compilation of arch/um/os-Linux/file.c fails due to failure to find FALLOC_FL_PUNCH_HOLE and FALLOC_FL_KEEP_SIZE definitions. It appears that /usr/include/bits/fcntl-linux.h (indirectly included by /usr/include/fcntl.h) does not include falloc.h with an older glibc, whereas a more up-to-date version does. Adding the direct include to file.c resolves the issue and does not cause problems for more recent glibc. Fixes: 50109b5a03b4 ("um: Add support for DISCARD in the UBD Driver") Cc: Brendan Higgins <brendanhiggins@google.com> Signed-off-by: Alan Maguire <alan.maguire@oracle.com> --- arch/um/os-Linux/file.c | 1 + 1 file changed, 1 insertion(+)