vserver 1.9.5.x5

[linux-2.6.git] / fs / ext2 / xattr.h

diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h
index 6268bcd..5f3bfde 100644 (file)
--- a/fs/ext2/xattr.h
+++ b/fs/ext2/xattr.h
@@ -17,7 +17,6 @@
 #define EXT2_XATTR_REFCOUNT_MAX                1024
 
 /* Name indexes */
-#define EXT2_XATTR_INDEX_MAX                   10
 #define EXT2_XATTR_INDEX_USER                  1
 #define EXT2_XATTR_INDEX_POSIX_ACL_ACCESS      2
 #define EXT2_XATTR_INDEX_POSIX_ACL_DEFAULT     3
@@ -57,26 +56,15 @@ struct ext2_xattr_entry {
 
 # ifdef CONFIG_EXT2_FS_XATTR
 
-struct ext2_xattr_handler {
-       char *prefix;
-       size_t (*list)(char *list, struct inode *inode, const char *name,
-                      int name_len);
-       int (*get)(struct inode *inode, const char *name, void *buffer,
-                  size_t size);
-       int (*set)(struct inode *inode, const char *name, const void *buffer,
-                  size_t size, int flags);
-};
-
-extern int ext2_xattr_register(int, struct ext2_xattr_handler *);
-extern void ext2_xattr_unregister(int, struct ext2_xattr_handler *);
+extern struct xattr_handler ext2_xattr_user_handler;
+extern struct xattr_handler ext2_xattr_trusted_handler;
+extern struct xattr_handler ext2_xattr_acl_access_handler;
+extern struct xattr_handler ext2_xattr_acl_default_handler;
+extern struct xattr_handler ext2_xattr_security_handler;
 
-extern int ext2_setxattr(struct dentry *, const char *, const void *, size_t, int);
-extern ssize_t ext2_getxattr(struct dentry *, const char *, void *, size_t);
 extern ssize_t ext2_listxattr(struct dentry *, char *, size_t);
-extern int ext2_removexattr(struct dentry *, const char *);
 
 extern int ext2_xattr_get(struct inode *, int, const char *, void *, size_t);
-extern int ext2_xattr_list(struct inode *, char *, size_t);
 extern int ext2_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
 
 extern void ext2_xattr_delete_inode(struct inode *);
@@ -85,11 +73,9 @@ extern void ext2_xattr_put_super(struct super_block *);
 extern int init_ext2_xattr(void);
 extern void exit_ext2_xattr(void);
 
+extern struct xattr_handler *ext2_xattr_handlers[];
+
 # else  /* CONFIG_EXT2_FS_XATTR */
-#  define ext2_setxattr                NULL
-#  define ext2_getxattr                NULL
-#  define ext2_listxattr       NULL
-#  define ext2_removexattr     NULL
 
 static inline int
 ext2_xattr_get(struct inode *inode, int name_index,
@@ -98,12 +84,6 @@ ext2_xattr_get(struct inode *inode, int name_index,
        return -EOPNOTSUPP;
 }
 
-static inline int
-ext2_xattr_list(struct inode *inode, char *buffer, size_t size)
-{
-       return -EOPNOTSUPP;
-}
-
 static inline int
 ext2_xattr_set(struct inode *inode, int name_index, const char *name,
               const void *value, size_t size, int flags)
@@ -132,9 +112,7 @@ exit_ext2_xattr(void)
 {
 }
 
-# endif  /* CONFIG_EXT2_FS_XATTR */
+#define ext2_xattr_handlers NULL
 
-extern struct ext2_xattr_handler ext2_xattr_user_handler;
-extern struct ext2_xattr_handler ext2_xattr_trusted_handler;
-extern struct ext2_xattr_handler ext2_xattr_security_handler;
+# endif  /* CONFIG_EXT2_FS_XATTR */