cleanup include/linux/reiserfs_xattr.h
PATCH 1/1 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 <[email protected]>
---
include/linux/reiserfs_xattr.h | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
include/linux/reiserfs_xattr.h renamed from include/linux/reiserfs_xattr.h.old +19 -5
@@ -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 */