aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-02-10 04:46:24 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 14:18:05 -0500
commit5b0a2075adb04846870a7fc1e62b08a532054ba6 (patch)
treefc877f8acfe582e2b096ae7d699d34e160b8a8e6
parent842f968f3fcdc475c95ec76a03b29c5147e87b54 (diff)
[PATCH] cleanup include/linux/xattr.h
- reduce the userspace visible part - fix the in-kernel compilation 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>
-rw-r--r--include/linux/Kbuild2
-rw-r--r--include/linux/xattr.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 683513e310de..bb881c3219fa 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -156,7 +156,6 @@ header-y += video_encoder.h
156header-y += videotext.h 156header-y += videotext.h
157header-y += vt.h 157header-y += vt.h
158header-y += wireless.h 158header-y += wireless.h
159header-y += xattr.h
160header-y += x25.h 159header-y += x25.h
161 160
162unifdef-y += acct.h 161unifdef-y += acct.h
@@ -336,6 +335,7 @@ unifdef-y += wait.h
336unifdef-y += wanrouter.h 335unifdef-y += wanrouter.h
337unifdef-y += watchdog.h 336unifdef-y += watchdog.h
338unifdef-y += wireless.h 337unifdef-y += wireless.h
338unifdef-y += xattr.h
339unifdef-y += xfrm.h 339unifdef-y += xfrm.h
340 340
341objhdr-y += version.h 341objhdr-y += version.h
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 0e7f1e20ea45..def131a5ac70 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -13,6 +13,10 @@
13#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ 13#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
14#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ 14#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
15 15
16#ifdef __KERNEL__
17
18#include <linux/types.h>
19
16/* Namespaces */ 20/* Namespaces */
17#define XATTR_OS2_PREFIX "os2." 21#define XATTR_OS2_PREFIX "os2."
18#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1) 22#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1)
@@ -29,6 +33,8 @@
29#define XATTR_USER_PREFIX "user." 33#define XATTR_USER_PREFIX "user."
30#define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1) 34#define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)
31 35
36struct inode;
37struct dentry;
32 38
33struct xattr_handler { 39struct xattr_handler {
34 char *prefix; 40 char *prefix;
@@ -50,4 +56,6 @@ ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_siz
50int generic_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags); 56int generic_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags);
51int generic_removexattr(struct dentry *dentry, const char *name); 57int generic_removexattr(struct dentry *dentry, const char *name);
52 58
59#endif /* __KERNEL__ */
60
53#endif /* _LINUX_XATTR_H */ 61#endif /* _LINUX_XATTR_H */