Home » Mailing list archives » linux-kernel » 2008 » May » 14

[PATCH] types.h: Don't expose struct ustat to userspace

Previous thread: [PATCH 3/3] always_inline timespec_add_ns by Jeremy Fitzhardinge on Wednesday, May 14, 2008 - 8:48 am. (1 message)

Next thread: [GIT PULL] please pull infinibang.git by Roland Dreier on Wednesday, May 14, 2008 - 9:33 am. (1 message)
[view original message]
From: maximilian attems
Subject: [PATCH] types.h: Don't expose struct ustat to userspace
Date: Wednesday, May 14, 2008 - 9:07 am

<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
---
 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 9dc2346..d4a9ce6 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 */
-- 
1.5.5.1

--


[ message continues ]
Previous thread: [PATCH 3/3] always_inline timespec_add_ns by Jeremy Fitzhardinge on Wednesday, May 14, 2008 - 8:48 am. (1 message)

Next thread: [GIT PULL] please pull infinibang.git by Roland Dreier on Wednesday, May 14, 2008 - 9:33 am. (1 message)