Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/fs/ext3/xattr.h b/fs/ext3/xattr.h
index 6ca51c0..2ceae38 100644 (file)
--- a/fs/ext3/xattr.h
+++ b/fs/ext3/xattr.h
@@ -16,7 +16,6 @@
 #define EXT3_XATTR_REFCOUNT_MAX                1024
 
 /* Name indexes */
-#define EXT3_XATTR_INDEX_MAX                   10
 #define EXT3_XATTR_INDEX_USER                  1
 #define EXT3_XATTR_INDEX_POSIX_ACL_ACCESS      2
 #define EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT     3
@@ -32,6 +31,10 @@ struct ext3_xattr_header {
        __u32   h_reserved[4];  /* zero right now */
 };
 
+struct ext3_xattr_ibody_header {
+       __le32  h_magic;        /* magic number for identification */
+};
+
 struct ext3_xattr_entry {
        __u8    e_name_len;     /* length of name */
        __u8    e_name_index;   /* attribute name index */
@@ -130,3 +133,14 @@ exit_ext3_xattr(void)
 #define ext3_xattr_handlers    NULL
 
 # endif  /* CONFIG_EXT3_FS_XATTR */
+
+#ifdef CONFIG_EXT3_FS_SECURITY
+extern int ext3_init_security(handle_t *handle, struct inode *inode,
+                               struct inode *dir);
+#else
+static inline int ext3_init_security(handle_t *handle, struct inode *inode,
+                               struct inode *dir)
+{
+       return 0;
+}
+#endif