[2.6 patch] cleanup include/linux/xattr.h

From: Adrian Bunk
Date: Fri Jan 05 2007 - 20:08:03 EST


- reduce the userspace visible part
- fix the in-kernel compilation

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

include/linux/Kbuild | 2 +-
include/linux/xattr.h | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)

--- linux-2.6.20-rc3-mm1/include/linux/Kbuild.old 2007-01-05 23:42:02.000000000 +0100
+++ linux-2.6.20-rc3-mm1/include/linux/Kbuild 2007-01-05 23:42:47.000000000 +0100
@@ -159,7 +159,6 @@
header-y += videotext.h
header-y += vt.h
header-y += wireless.h
-header-y += xattr.h
header-y += x25.h

unifdef-y += acct.h
@@ -337,6 +336,7 @@
unifdef-y += wanrouter.h
unifdef-y += watchdog.h
unifdef-y += wireless.h
+unifdef-y += xattr.h
unifdef-y += xfrm.h

objhdr-y += version.h
--- linux-2.6.20-rc3-mm1/include/linux/xattr.h.old 2007-01-05 23:42:43.000000000 +0100
+++ linux-2.6.20-rc3-mm1/include/linux/xattr.h 2007-01-05 23:42:47.000000000 +0100
@@ -13,6 +13,10 @@
#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */

+#ifdef __KERNEL__
+
+#include <linux/types.h>
+
/* Namespaces */
#define XATTR_OS2_PREFIX "os2."
#define XATTR_OS2_PREFIX_LEN (sizeof (XATTR_OS2_PREFIX) - 1)
@@ -29,6 +33,8 @@
#define XATTR_USER_PREFIX "user."
#define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)

+struct inode;
+struct dentry;

struct xattr_handler {
char *prefix;
@@ -50,4 +56,6 @@
int generic_setxattr(struct dentry *dentry, const char *name, const void *value, size_t size, int flags);
int generic_removexattr(struct dentry *dentry, const char *name);

+#endif /* __KERNEL__ */
+
#endif /* _LINUX_XATTR_H */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/