Commit 521dae19 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5b0a2075
...@@ -2,7 +2,10 @@ ...@@ -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 */ /* Magic value in header */
#define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */ #define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */
...@@ -13,7 +16,18 @@ struct reiserfs_xattr_header { ...@@ -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 { struct reiserfs_xattr_handler {
char *prefix; char *prefix;
...@@ -49,9 +63,7 @@ int reiserfs_xattr_set(struct inode *, const char *, const void *, size_t, int); ...@@ -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 user_handler;
extern struct reiserfs_xattr_handler trusted_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; int reiserfs_xattr_register_handlers(void) __init;
void reiserfs_xattr_unregister_handlers(void); void reiserfs_xattr_unregister_handlers(void);
...@@ -137,6 +149,8 @@ static inline int reiserfs_xattr_init(struct super_block *sb, int mount_flags) ...@@ -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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment