Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

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

diff --git a/fs/ext2/xattr.h b/fs/ext2/xattr.h
index 65ea5f9..bf8175b 100644 (file)
--- a/fs/ext2/xattr.h
+++ b/fs/ext2/xattr.h
@@ -6,7 +6,6 @@
   (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
 */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/xattr.h>
 
@@ -17,7 +16,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
@@ -66,7 +64,6 @@ extern struct xattr_handler ext2_xattr_security_handler;
 extern ssize_t ext2_listxattr(struct dentry *, char *, size_t);
 
 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 *);
@@ -86,12 +83,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)
@@ -124,3 +115,11 @@ exit_ext2_xattr(void)
 
 # endif  /* CONFIG_EXT2_FS_XATTR */
 
+#ifdef CONFIG_EXT2_FS_SECURITY
+extern int ext2_init_security(struct inode *inode, struct inode *dir);
+#else
+static inline int ext2_init_security(struct inode *inode, struct inode *dir)
+{
+       return 0;
+}
+#endif