diff options
| author | maximilian attems <max@stro.at> | 2008-05-23 13:04:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-24 09:56:09 -0700 |
| commit | 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8 (patch) | |
| tree | ba2a2b94aa2e4d0308c7586b498cd7d746587c1e /include | |
| parent | 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2 (diff) | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 9dc2346627b..d4a9ce6e276 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -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 */ |