[PATCH] cleanup include/linux/reiserfs_xattr.h

- #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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index 966c35851b2e784a445bac96e1458554ab8784de..66a96814d614c7dd23c4371d80a54a1a829b6a84 100644 (file)
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -2,7 +2,10 @@
   File: linux/reiserfs_xattr.h
 */
 
   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" */
 
 /* Magic value in header */
 #define REISERFS_XATTR_MAGIC 0x52465841        /* "RFXA" */


@@ -13,7 +16,18 @@ struct reiserfs_xattr_header {
 };
 
 #ifdef __KERNEL__
 };
 
 #ifdef __KERNEL__

+

 #include <linux/init.h>
 #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;
 
 struct reiserfs_xattr_handler {
        char *prefix;


@@ -49,9 +63,7 @@ int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int);
 
 extern struct reiserfs_xattr_handler user_handler;
 extern struct reiserfs_xattr_handler trusted_handler;
 
 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;
 extern struct reiserfs_xattr_handler security_handler;

-#endif

 
 int reiserfs_xattr_register_handlers(void) __init;
 void reiserfs_xattr_unregister_handlers(void);
 
 int reiserfs_xattr_register_handlers(void) __init;
 void reiserfs_xattr_unregister_handlers(void);


@@ -137,6 +149,8 @@ static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags)
 static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
 {
 }
 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  */