Commit 35f34013 authored Mar 17, 2020 by Alan Maguire Committed by Richard Weinberger Mar 29, 2020

um: falloc.h needs to be directly included for older libc



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: 50109b5a ("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>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

parent e355b2f5

arch/um/os-Linux/file.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

Admin message