* [2.6 patch] cleanup include/linux/reiserfs_xattr.h
@ 2007-01-06 1:09 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2007-01-06 1:09 UTC (permalink / raw)
To: reiserfs-dev; +Cc: linux-kernel
- #ifdef guard this header for multiple inclusion
- adjust the #include's to what is actually required by this header
- remove an unneeded #ifdef
- #endif comments
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
include/linux/reiserfs_xattr.h | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
--- linux-2.6.20-rc3-mm1/include/linux/reiserfs_xattr.h.old 2007-01-05 23:47:43.000000000 +0100
+++ linux-2.6.20-rc3-mm1/include/linux/reiserfs_xattr.h 2007-01-05 23:48:31.000000000 +0100
@@ -2,7 +2,10 @@
File: linux/reiserfs_xattr.h
*/
-#include <linux/xattr.h>
+#ifndef _LINUX_REISERFS_XATTR_H
+#define _LINUX_REISERFS_XATTR_H
+
+#include <linux/types.h>
/* Magic value in header */
#define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */
@@ -13,7 +16,18 @@
};
#ifdef __KERNEL__
+
#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/rwsem.h>
+#include <linux/reiserfs_fs_i.h>
+#include <linux/reiserfs_fs.h>
+
+struct inode;
+struct dentry;
+struct iattr;
+struct super_block;
+struct nameidata;
struct reiserfs_xattr_handler {
char *prefix;
@@ -49,9 +63,7 @@
extern struct reiserfs_xattr_handler user_handler;
extern struct reiserfs_xattr_handler trusted_handler;
-#ifdef CONFIG_REISERFS_FS_SECURITY
extern struct reiserfs_xattr_handler security_handler;
-#endif
int reiserfs_xattr_register_handlers(void) __init;
void reiserfs_xattr_unregister_handlers(void);
@@ -137,6 +149,8 @@
static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
{
}
-#endif
+#endif /* CONFIG_REISERFS_FS_XATTR */
+
+#endif /* __KERNEL__ */
-#endif /* __KERNEL__ */
+#endif /* _LINUX_REISERFS_XATTR_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
* [2.6 patch] cleanup include/linux/reiserfs_xattr.h
@ 2007-01-21 19:13 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2007-01-21 19:13 UTC (permalink / raw)
To: Andrew Morton; +Cc: reiserfs-dev, linux-kernel
- #ifdef guard this header for multiple inclusion
- adjust the #include's to what is actually required by this header
- remove an unneeded #ifdef
- #endif comments
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 6 Jan 2007
include/linux/reiserfs_xattr.h | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
--- linux-2.6.20-rc3-mm1/include/linux/reiserfs_xattr.h.old 2007-01-05 23:47:43.000000000 +0100
+++ linux-2.6.20-rc3-mm1/include/linux/reiserfs_xattr.h 2007-01-05 23:48:31.000000000 +0100
@@ -2,7 +2,10 @@
File: linux/reiserfs_xattr.h
*/
-#include <linux/xattr.h>
+#ifndef _LINUX_REISERFS_XATTR_H
+#define _LINUX_REISERFS_XATTR_H
+
+#include <linux/types.h>
/* Magic value in header */
#define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */
@@ -13,7 +16,18 @@
};
#ifdef __KERNEL__
+
#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/rwsem.h>
+#include <linux/reiserfs_fs_i.h>
+#include <linux/reiserfs_fs.h>
+
+struct inode;
+struct dentry;
+struct iattr;
+struct super_block;
+struct nameidata;
struct reiserfs_xattr_handler {
char *prefix;
@@ -49,9 +63,7 @@
extern struct reiserfs_xattr_handler user_handler;
extern struct reiserfs_xattr_handler trusted_handler;
-#ifdef CONFIG_REISERFS_FS_SECURITY
extern struct reiserfs_xattr_handler security_handler;
-#endif
int reiserfs_xattr_register_handlers(void) __init;
void reiserfs_xattr_unregister_handlers(void);
@@ -137,6 +149,8 @@
static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
{
}
-#endif
+#endif /* CONFIG_REISERFS_FS_XATTR */
+
+#endif /* __KERNEL__ */
-#endif /* __KERNEL__ */
+#endif /* _LINUX_REISERFS_XATTR_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-21 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-06 1:09 [2.6 patch] cleanup include/linux/reiserfs_xattr.h Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2007-01-21 19:13 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox