Commit 6c7c6afb authored May 23, 2008 by maximilian attems Committed by Linus Torvalds May 24, 2008

types.h: don't expose struct ustat to userspace

<linux/types.h> can't be used together with <sys/ustat.h> because they
both define struct ustat:

    $ cat test.c
    #include <sys/ustat.h>
    #include <linux/types.h>
    $ gcc -c test.c
    In file included from test.c:2:
    /usr/include/linux/types.h:165: error: redefinition of 'struct ustat'

has been reported a while ago to debian, but seems to have been
lost in cat fighting: http://bugs.debian.org/429064



Signed-off-by: maximilian attems <max@stro.at>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4b6f6ce9

include/linux/types.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -197,8 +197,6 @@ typedef u64 resource_size_t;
		typedef u32 resource_size_t;
		#endif

		#endif /* __KERNEL__ */

		struct ustat {
		__kernel_daddr_t f_tfree;
		__kernel_ino_t f_tinode;
		@@ -206,4 +204,6 @@ struct ustat {
		char f_fpack[6];
		};

		#endif /* __KERNEL__ */

		#endif /* _LINUX_TYPES_H */

Admin message