On Mon, Aug 08, 2022 at 02:17:35PM +0100, David Howells wrote: > Hi, > > We're seeing issues in autofs and xfstests whereby linux/mount.h (the UAPI > version) as included indirectly by linux/fs.h is conflicting with > sys/mount.h (there's a struct and an enum). (The linux/mount.h and sys/mount.h is painful for userspace too btw.) > > Would it be possible to just remove the #include from linux/fs.h (as patch > below) and rely on those hopefully few things that need mount flags that don't > use the glibc header for them working around it by configuration? > > David > --- > uapi: Remove the inclusion of linux/mount.h from uapi/linux/fs.h > > Remove the inclusion of <linux/mount.h> from uapi/linux/fs.h as it > interferes with definitions in sys/mount.h - but linux/fs.h is needed by > various things where mount flags and structs are not. > > Note that this will likely have the side effect of causing some build > failures. > > Reported-by: Ian Kent <raven@xxxxxxxxxx> > Signed-off-by: David Howells <dhowells@xxxxxxxxxx> > cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> > cc: Christian Brauner <christian@xxxxxxxxxx> > cc: linux-fsdevel@xxxxxxxxxxxxxxx > cc: linux-api@xxxxxxxxxxxxxxx > --- Yeah, I think this is ok. Reviewed-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
