diff options
| author | Alan Maguire <alan.maguire@oracle.com> | 2020-03-17 18:35:34 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-03-29 23:21:42 +0200 |
| commit | 35f3401317a3b26aa01fde8facfd320f2628fdcc (patch) | |
| tree | e9e23fc8704b68481777f8b59b66fa18f994308a /arch/um | |
| parent | um: ubd: Retry buffer read on any kind of error (diff) | |
| download | linux-35f3401317a3b26aa01fde8facfd320f2628fdcc.tar.xz linux-35f3401317a3b26aa01fde8facfd320f2628fdcc.zip | |
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: 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>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/os-Linux/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c index fbda10535dab..5c819f89b8c2 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> |