| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | Avoid conflicts between sys/mount.h and linux/mount.h |
| 2 | |
| 3 | linux/fs.h includes linux/mount.h and this include file is unused so |
| 4 | do not include it and avoid conflict too with glibc 2.36+ see [1] |
| 5 | |
| 6 | [1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- a/modules/parse_amd.c |
| 12 | +++ b/modules/parse_amd.c |
| 13 | @@ -27,7 +27,6 @@ |
| 14 | #include <sys/utsname.h> |
| 15 | #include <netinet/in.h> |
| 16 | #include <sys/mount.h> |
| 17 | -#include <linux/fs.h> |
| 18 | |
| 19 | #define MODULE_PARSE |
| 20 | #include "automount.h" |
| 21 | --- a/modules/parse_sun.c |
| 22 | +++ b/modules/parse_sun.c |
| 23 | @@ -30,7 +30,6 @@ |
| 24 | #include <sys/utsname.h> |
| 25 | #include <netinet/in.h> |
| 26 | #include <sys/mount.h> |
| 27 | -#include <linux/fs.h> |
| 28 | |
| 29 | #define MODULE_PARSE |
| 30 | #include "automount.h" |