Commit 6c7c6afb authored by maximilian attems's avatar maximilian attems Committed by Linus Torvalds

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/429064Signed-off-by: default avatarmaximilian attems <max@stro.at>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b6f6ce9
...@@ -197,8 +197,6 @@ typedef u64 resource_size_t; ...@@ -197,8 +197,6 @@ typedef u64 resource_size_t;
typedef u32 resource_size_t; typedef u32 resource_size_t;
#endif #endif
#endif /* __KERNEL__ */
struct ustat { struct ustat {
__kernel_daddr_t f_tfree; __kernel_daddr_t f_tfree;
__kernel_ino_t f_tinode; __kernel_ino_t f_tinode;
...@@ -206,4 +204,6 @@ struct ustat { ...@@ -206,4 +204,6 @@ struct ustat {
char f_fpack[6]; char f_fpack[6];
}; };
#endif /* __KERNEL__ */
#endif /* _LINUX_TYPES_H */ #endif /* _LINUX_TYPES_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment