- obsolete

[packages/kernel.git] / linux-2.4.22-reiserfs-acl+ea.patch

diff -urN linux-2.4.22/fs/Config.in linux-2.4.22-aclea/fs/Config.in
--- linux-2.4.22/fs/Config.in   2003-09-12 17:01:18.000000000 +0200
+++ linux-2.4.22-aclea/fs/Config.in     2003-09-12 17:19:43.000000000 +0200
@@ -13,6 +13,10 @@
 tristate 'Reiserfs support' CONFIG_REISERFS_FS
 dep_mbool '  Enable reiserfs debug mode' CONFIG_REISERFS_CHECK $CONFIG_REISERFS_FS
 dep_mbool '  Stats in /proc/fs/reiserfs' CONFIG_REISERFS_PROC_INFO $CONFIG_REISERFS_FS
+dep_mbool '  ReiserFS extended attributes' CONFIG_REISERFS_FS_XATTR $CONFIG_REISERFS_FS
+dep_mbool '  ReiserFS extended user attributes' CONFIG_REISERFS_FS_XATTR_USER $CONFIG_REISERFS_FS_XATTR
+dep_mbool '  ReiserFS trusted extended attributes' CONFIG_REISERFS_FS_XATTR_TRUSTED $CONFIG_REISERFS_FS_XATTR
+dep_mbool '  ReiserFS POSIX Access Control Lists' CONFIG_REISERFS_FS_POSIX_ACL $CONFIG_REISERFS_FS_XATTR $CONFIG_FS_POSIX_ACL
 
 dep_tristate 'ADFS file system support (EXPERIMENTAL)' CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
 dep_mbool '  ADFS write support (DANGEROUS)' CONFIG_ADFS_FS_RW $CONFIG_ADFS_FS $CONFIG_EXPERIMENTAL
diff -urN linux-2.4.22/fs/reiserfs/Makefile linux-2.4.22-aclea/fs/reiserfs/Makefile
--- linux-2.4.22/fs/reiserfs/Makefile   2003-08-25 13:44:43.000000000 +0200
+++ linux-2.4.22-aclea/fs/reiserfs/Makefile     2003-09-12 17:19:43.000000000 +0200
@@ -11,6 +11,11 @@
 obj-y   := bitmap.o do_balan.o namei.o inode.o file.o dir.o fix_node.o super.o prints.o objectid.o \
 lbalance.o ibalance.o stree.o hashes.o buffer2.o tail_conversion.o journal.o resize.o item_ops.o ioctl.o procfs.o
 
+obj-$(CONFIG_REISERFS_FS_XATTR) += xattr.o
+obj-$(CONFIG_REISERFS_FS_XATTR_USER) += xattr_user.o
+obj-$(CONFIG_REISERFS_FS_XATTR_TRUSTED) += xattr_trusted.o
+obj-$(CONFIG_REISERFS_FS_POSIX_ACL) += xattr_acl.o
+
 obj-m   := $(O_TARGET)
 
 # gcc -O2 (the kernel default)  is overaggressive on ppc32 when many inline
diff -urN linux-2.4.22/fs/reiserfs/dir.c linux-2.4.22-aclea/fs/reiserfs/dir.c
--- linux-2.4.22/fs/reiserfs/dir.c      2003-08-25 13:44:43.000000000 +0200
+++ linux-2.4.22-aclea/fs/reiserfs/dir.c        2003-09-12 17:19:29.000000000 +0200
@@ -110,6 +110,15 @@
                    /* too big to send back to VFS */
                    continue ;
                }
+
+                /* Ignore the .reiserfs_priv entry */
+               if (reiserfs_xattrs (inode->i_sb) && 
+                    !old_format_only(inode->i_sb) &&
+                    inode->i_sb->u.reiserfs_sb.priv_root &&
+                    inode->i_sb->u.reiserfs_sb.priv_root->d_inode &&
+                    deh_objectid (deh) == le32_to_cpu (INODE_PKEY(inode->i_sb->u.reiserfs_sb.priv_root->d_inode)->k_objectid))
+                  continue;
+
                d_off = deh_offset (deh);
                filp->f_pos = d_off ;
                d_ino = deh_objectid (deh);
diff -urN linux-2.4.22/fs/reiserfs/file.c linux-2.4.22-aclea/fs/reiserfs/file.c
--- linux-2.4.22/fs/reiserfs/file.c     2002-11-29 00:53:15.000000000 +0100
+++ linux-2.4.22-aclea/fs/reiserfs/file.c       2003-09-12 17:19:36.000000000 +0200
@@ -5,6 +5,8 @@
 
 #include <linux/sched.h>
 #include <linux/reiserfs_fs.h>
+#include <linux/reiserfs_acl.h>
+#include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 
 /*
@@ -90,45 +92,6 @@
   return ( n_err < 0 ) ? -EIO : 0;
 }
 
-static int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) {
-    struct inode *inode = dentry->d_inode ;
-    int error ;
-    if (attr->ia_valid & ATTR_SIZE) {
-       /* version 2 items will be caught by the s_maxbytes check
-       ** done for us in vmtruncate
-       */
-       if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5 &&
-           attr->ia_size > MAX_NON_LFS)
-            return -EFBIG ;
-
-       /* fill in hole pointers in the expanding truncate case. */
-        if (attr->ia_size > inode->i_size) {
-           error = generic_cont_expand(inode, attr->ia_size) ;
-           if (inode->u.reiserfs_i.i_prealloc_count > 0) {
-               struct reiserfs_transaction_handle th ;
-               /* we're changing at most 2 bitmaps, inode + super */
-               journal_begin(&th, inode->i_sb, 4) ;
-               reiserfs_discard_prealloc (&th, inode);
-               journal_end(&th, inode->i_sb, 4) ;
-           }
-           if (error)
-               return error ;
-       }
-    }
-
-    if ((((attr->ia_valid & ATTR_UID) && (attr->ia_uid & ~0xffff)) ||
-        ((attr->ia_valid & ATTR_GID) && (attr->ia_gid & ~0xffff))) &&
-       (get_inode_sd_version (inode) == STAT_DATA_V1))
-               /* stat data of format v3.5 has 16 bit uid and gid */
-           return -EINVAL;
-
-    error = inode_change_ok(inode, attr) ;
-    if (!error)
-        inode_setattr(inode, attr) ;
-
-    return error ;
-}
-
 struct file_operations reiserfs_file_operations = {
     read:      generic_file_read,
     write:     generic_file_write,
@@ -142,6 +105,11 @@
 struct  inode_operations reiserfs_file_inode_operations = {
     truncate:  reiserfs_vfs_truncate_file,
     setattr:    reiserfs_setattr,
+    setxattr:   reiserfs_setxattr, 
+    getxattr:   reiserfs_getxattr, 
+    listxattr:   reiserfs_listxattr, 
+    removexattr:   reiserfs_removexattr, 
+    permission: reiserfs_permission,
 };
 
 
diff -urN linux-2.4.22/fs/reiserfs/inode.c linux-2.4.22-aclea/fs/reiserfs/inode.c
--- linux-2.4.22/fs/reiserfs/inode.c    2003-08-25 13:44:43.000000000 +0200
+++ linux-2.4.22-aclea/fs/reiserfs/inode.c      2003-09-12 17:19:36.000000000 +0200
@@ -5,8 +5,11 @@
 #include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/reiserfs_fs.h>
+#include <linux/reiserfs_acl.h>
+#include <linux/reiserfs_xattr.h>
 #include <linux/locks.h>
 #include <linux/smp_lock.h>
+#include <linux/quotaops.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
 
@@ -37,6 +40,8 @@
     if (INODE_PKEY(inode)->k_objectid != 0) { /* also handles bad_inode case */
        down (&inode->i_sem); 
 
+       reiserfs_delete_xattrs (inode);
+
        journal_begin(&th, inode->i_sb, jbegin_count) ;
        reiserfs_update_inode_transaction(inode) ;
        windex = push_journal_writer("delete_inode") ;
@@ -206,6 +211,10 @@
   struct super_block *s = th->t_super ;
   int len = th->t_blocks_allocated ;
 
+  /* we cannot restart while nested */
+  if (th->t_refcount > 1) {
+      return  ;
+  }
   pathrelse(path) ;
   reiserfs_update_sd(th, inode) ;
   journal_end(th, s, len) ;
@@ -1016,7 +1025,7 @@
        inode->i_op = &reiserfs_dir_inode_operations;
        inode->i_fop = &reiserfs_dir_operations;
     } else if (S_ISLNK (inode->i_mode)) {
-       inode->i_op = &page_symlink_inode_operations;
+       inode->i_op = &reiserfs_symlink_inode_operations;
        inode->i_mapping->a_ops = &reiserfs_address_space_operations;
     } else {
        inode->i_blocks = 0;
@@ -1694,6 +1703,18 @@
        goto out_inserted_sd;
     }
 
+    if (reiserfs_posixacl (inode->i_sb)) {
+        retval = reiserfs_inherit_default_acl (dir, dentry, inode);
+        if (retval) {
+            iput (inode);
+            err = retval;
+            reiserfs_check_path(&path_to_key) ;
+            goto out_inserted_sd;
+        }
+    } else if (inode->i_sb->s_flags & MS_POSIXACL) {
+        reiserfs_warning (inode->i_sb, "ACLs aren't enabled in the fs, but vfs thinks they are!\n");
+    }
+
     insert_inode_hash (inode);
     reiserfs_update_sd(th, inode) ;
     reiserfs_check_path(&path_to_key) ;
@@ -2229,6 +2250,72 @@
                              reiserfs_get_block_direct_io) ;
 }
 
+int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) {
+    struct inode *inode = dentry->d_inode ;
+    int error ;
+    unsigned int ia_valid = attr->ia_valid;
+    if (attr->ia_valid & ATTR_SIZE) {
+       /* version 2 items will be caught by the s_maxbytes check
+       ** done for us in vmtruncate
+       */
+       if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5 &&
+           attr->ia_size > MAX_NON_LFS)
+            return -EFBIG ;
+
+       /* fill in hole pointers in the expanding truncate case. */
+        if (attr->ia_size > inode->i_size) {
+           error = generic_cont_expand(inode, attr->ia_size) ;
+           if (inode->u.reiserfs_i.i_prealloc_count > 0) {
+               struct reiserfs_transaction_handle th ;
+               /* we're changing at most 2 bitmaps, inode + super */
+               journal_begin(&th, inode->i_sb, 4) ;
+               reiserfs_discard_prealloc (&th, inode);
+               journal_end(&th, inode->i_sb, 4) ;
+           }
+           if (error)
+               return error ;
+       }
+    }
+
+    if ((((attr->ia_valid & ATTR_UID) && (attr->ia_uid & ~0xffff)) ||
+        ((attr->ia_valid & ATTR_GID) && (attr->ia_gid & ~0xffff))) &&
+       (get_inode_sd_version (inode) == STAT_DATA_V1))
+               /* stat data of format v3.5 has 16 bit uid and gid */
+           return -EINVAL;
+
+    error = inode_change_ok(inode, attr) ;
+    if (!error) {
+       if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
+           (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {
+                if (!(attr->ia_valid & ATTR_SIZE))
+                    down (&inode->i_sem);
+                error = reiserfs_chown_xattrs (inode, attr);
+                if (!(attr->ia_valid & ATTR_SIZE))
+                    up (&inode->i_sem);
+
+#if defined(CONFIG_QUOTA)
+                if (!error)
+                    error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
+#endif
+        }
+        if (!error)
+            inode_setattr(inode, attr) ;
+    }
+
+
+    if (!error && reiserfs_posixacl (inode->i_sb)) {
+        if (attr->ia_valid & ATTR_MODE) {
+            if (!(attr->ia_valid & ATTR_SIZE))
+                down (&inode->i_sem);
+            error = reiserfs_acl_chmod (inode);
+            if (!(attr->ia_valid & ATTR_SIZE))
+                up (&inode->i_sem);
+        }
+    }
+
+    return error ;
+}
+
 struct address_space_operations reiserfs_address_space_operations = {
     writepage: reiserfs_writepage,
     readpage: reiserfs_readpage, 
diff -urN linux-2.4.22/fs/reiserfs/journal.c linux-2.4.22-aclea/fs/reiserfs/journal.c
--- linux-2.4.22/fs/reiserfs/journal.c  2003-08-25 13:44:43.000000000 +0200
+++ linux-2.4.22-aclea/fs/reiserfs/journal.c    2003-09-12 17:04:51.000000000 +0200
@@ -2232,6 +2232,9 @@
   time_t now = CURRENT_TIME ;
   if (reiserfs_dont_log(th->t_super)) 
     return 0 ;
+  /* cannot restart while nested */
+  if (th->t_refcount > 1)
+    return 0 ;
   if ( SB_JOURNAL(th->t_super)->j_must_wait > 0 ||
        (SB_JOURNAL(th->t_super)->j_len_alloc + new_alloc) >= SB_JOURNAL_MAX_BATCH(th->t_super) || 
        atomic_read(&(SB_JOURNAL(th->t_super)->j_jlock)) ||
@@ -2287,6 +2290,9 @@
     return 0 ;
   }
   PROC_INFO_INC( p_s_sb, journal.journal_being );
+  /* set here for journal_join */
+  th->t_refcount = 1; 
+  th->t_super = p_s_sb ;
 
 relock:
   lock_journal(p_s_sb) ;
@@ -2343,9 +2349,7 @@
   SB_JOURNAL(p_s_sb)->j_len_alloc += nblocks ;
   th->t_blocks_logged = 0 ;
   th->t_blocks_allocated = nblocks ;
-  th->t_super = p_s_sb ;
   th->t_trans_id = SB_JOURNAL(p_s_sb)->j_trans_id ;
-  th->t_caller = "Unknown" ;
   unlock_journal(p_s_sb) ;
   p_s_sb->s_dirt = 1; 
   return 0 ;
@@ -2353,11 +2357,47 @@
 
 
 static int journal_join(struct reiserfs_transaction_handle *th, struct super_block *p_s_sb, unsigned long nblocks) {
+  struct reiserfs_transaction_handle *cur_th = current->journal_info;
+
+  /* this keeps do_journal_end from NULLing out the current->journal_info
+  ** pointer
+  */
+  th->t_handle_save = cur_th ;
+  if (cur_th && cur_th->t_refcount > 1) {
+      BUG() ;
+  }
   return do_journal_begin_r(th, p_s_sb, nblocks, 1) ;
 }
 
 int journal_begin(struct reiserfs_transaction_handle *th, struct super_block  * p_s_sb, unsigned long nblocks) {
-  return do_journal_begin_r(th, p_s_sb, nblocks, 0) ;
+    struct reiserfs_transaction_handle *cur_th = current->journal_info ;
+    int ret ;
+
+    th->t_handle_save = NULL ;
+    if (cur_th) {
+       /* we are nesting into the current transaction */
+       if (cur_th->t_super == p_s_sb) {
+             cur_th->t_refcount++ ;
+             memcpy(th, cur_th, sizeof(*th)); 
+             if (th->t_refcount <= 1) 
+                     printk("BAD: refcount <= 1, but journal_info != 0\n"); 
+             return 0;
+       } else {
+           /* we've ended up with a handle from a different filesystem.
+           ** save it and restore on journal_end.  This should never
+           ** really happen...
+           */
+           reiserfs_warning("clm-2100: nesting info a different FS\n") ;
+           th->t_handle_save = current->journal_info ;
+           current->journal_info = th;
+       }
+    } else {
+       current->journal_info = th;
+    }
+    ret = do_journal_begin_r(th, p_s_sb, nblocks, 0) ;
+    if (current->journal_info != th)
+        BUG() ;
+    return ret ;
 }
 
 /* not used at all */
@@ -2497,7 +2537,23 @@
 }
 
 int journal_end(struct reiserfs_transaction_handle *th, struct super_block *p_s_sb, unsigned long nblocks) {
-  return do_journal_end(th, p_s_sb, nblocks, 0) ;
+  if (!current->journal_info && th->t_refcount > 1) 
+    printk("REISER-NESTING: th NULL, refcount %d\n", th->t_refcount); 
+  if (th->t_refcount > 1) { 
+    struct reiserfs_transaction_handle *cur_th = current->journal_info ;
+
+    /* we aren't allowed to close a nested transaction on a different
+    ** filesystem from the one in the task struct
+    */
+    if (cur_th->t_super != th->t_super)
+      BUG() ;
+
+    th->t_refcount--;
+    memcpy(current->journal_info, th, sizeof(*th));
+    return 0; 
+  } else {
+    return do_journal_end(th, p_s_sb, nblocks, 0) ;
+  }
 }
 
 /* removes from the current transaction, relsing and descrementing any counters.  
@@ -2600,6 +2656,10 @@
 */
 int journal_end_sync(struct reiserfs_transaction_handle *th, struct super_block *p_s_sb, unsigned long nblocks) {
 
+  /* you can sync while nested, very, very bad */
+  if (th->t_refcount > 1) {
+    BUG() ;
+  }
   if (SB_JOURNAL(p_s_sb)->j_len == 0) {
     reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 1) ;
     journal_mark_dirty(th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb)) ;
@@ -3000,6 +3060,10 @@
   int wait_on_commit = flags & WAIT ;
   struct reiserfs_super_block *rs ; 
 
+  if (th->t_refcount > 1)
+    BUG() ;
+
+  current->journal_info = th->t_handle_save;
   if (reiserfs_dont_log(th->t_super)) {
     return 0 ;
   }
@@ -3037,8 +3101,11 @@
   }
 
 #ifdef REISERFS_PREALLOCATE
+  /* quota ops might need to nest, setup the journal_info pointer for them */
+  current->journal_info = th ;
   reiserfs_discard_all_prealloc(th); /* it should not involve new blocks into
                                      * the transaction */
+  current->journal_info = th->t_handle_save ;
 #endif
   
   rs = SB_DISK_SUPER_BLOCK(p_s_sb) ;
diff -urN linux-2.4.22/fs/reiserfs/namei.c linux-2.4.22-aclea/fs/reiserfs/namei.c
--- linux-2.4.22/fs/reiserfs/namei.c    2003-08-25 13:44:43.000000000 +0200
+++ linux-2.4.22-aclea/fs/reiserfs/namei.c      2003-09-12 17:19:36.000000000 +0200
@@ -6,6 +6,8 @@
 #include <linux/sched.h>
 #include <linux/bitops.h>
 #include <linux/reiserfs_fs.h>
+#include <linux/reiserfs_acl.h>
+#include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 
 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
@@ -323,10 +325,21 @@
     retval = reiserfs_find_entry (dir, dentry->d_name.name, dentry->d_name.len, &path_to_entry, &de);
     pathrelse (&path_to_entry);
     if (retval == NAME_FOUND) {
+        /* Hide the .reiserfs_priv dir */
+       if (reiserfs_xattrs (dir->i_sb) &&
+            !old_format_only(dir->i_sb) &&
+            dir->i_sb->u.reiserfs_sb.priv_root &&
+            dir->i_sb->u.reiserfs_sb.priv_root->d_inode &&
+            de.de_objectid == le32_to_cpu (INODE_PKEY(dir->i_sb->u.reiserfs_sb.priv_root->d_inode)->k_objectid)) {
+            return ERR_PTR (-EACCES);
+       }
        inode = reiserfs_iget (dir->i_sb, (struct cpu_key *)&(de.de_dir_id));
        if (!inode || IS_ERR(inode)) {
            return ERR_PTR(-EACCES);
         }
+        /* Propogate the priv_object flag so we know we're in the priv tree */
+        if (is_reiserfs_priv_object (dir))
+            inode->u.reiserfs_i.i_flags |= i_priv_object;
     }
     if ( retval == IO_ERROR ) {
        return ERR_PTR(-EIO);
@@ -527,6 +540,7 @@
     struct inode * inode;
     int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2 ;
     struct reiserfs_transaction_handle th ;
+    int locked;
 
     if (!(inode = new_inode(dir->i_sb))) {
        return -ENOMEM ;
@@ -535,8 +549,11 @@
     if (retval)
        return retval ;
 
+    locked = reiserfs_cache_default_acl (dir);
+    if (locked)
+       reiserfs_write_lock_xattrs (dir->i_sb);
+
     journal_begin(&th, dir->i_sb, jbegin_count) ;
-    th.t_caller = "create" ;
     retval = reiserfs_new_inode (&th, dir, mode, 0, 0/*i_size*/, dentry, inode);
     if (retval) {
        goto out_failed ;
@@ -548,6 +565,9 @@
 
     retval = reiserfs_add_entry (&th, dir, dentry->d_name.name, dentry->d_name.len, 
                                inode, 1/*visible*/);
+    if (locked)
+       reiserfs_write_unlock_xattrs (dir->i_sb);
+
     if (retval) {
        inode->i_nlink--;
        reiserfs_update_sd (&th, inode);
@@ -573,6 +593,7 @@
     struct inode * inode;
     struct reiserfs_transaction_handle th ;
     int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3; 
+    int locked;
 
     if (!(inode = new_inode(dir->i_sb))) {
        return -ENOMEM ;
@@ -581,9 +602,17 @@
     if (retval)
         return retval ;
 
+    locked = reiserfs_cache_default_acl (dir);
+    if (locked)
+        reiserfs_write_lock_xattrs (inode->i_sb);
+
     journal_begin(&th, dir->i_sb, jbegin_count) ;
 
     retval = reiserfs_new_inode(&th, dir, mode, 0, 0/*i_size*/, dentry, inode);
+
+    if (locked)
+       reiserfs_write_unlock_xattrs (inode->i_sb);
+
     if (retval) {
        goto out_failed; 
     }
@@ -621,6 +650,7 @@
     struct inode * inode;
     struct reiserfs_transaction_handle th ;
     int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3; 
+    int locked;
 
     mode = S_IFDIR | mode;
     if (!(inode = new_inode(dir->i_sb))) {
@@ -630,6 +660,10 @@
     if (retval)
        return retval ;
 
+    locked = reiserfs_cache_default_acl (dir);
+    if (locked)
+        reiserfs_write_lock_xattrs (inode->i_sb);
+
     journal_begin(&th, dir->i_sb, jbegin_count) ;
 
     /* inc the link count now, so another writer doesn't overflow it while
@@ -645,6 +679,9 @@
                                old_format_only (dir->i_sb) ?
                                EMPTY_DIR_SIZE_V1 : EMPTY_DIR_SIZE,
                                dentry, inode) ;
+    if (locked)
+        reiserfs_write_unlock_xattrs (inode->i_sb);
+
     if (retval) {
        dir->i_nlink-- ;
        goto out_failed ;
@@ -892,6 +929,8 @@
     memcpy (name, symname, strlen (symname));
     padd_item (name, item_len, strlen (symname));
 
+    /* We would inherit the default ACL here, but symlinks don't get ACLs */
+
     journal_begin(&th, parent_dir->i_sb, jbegin_count) ;
 
     retval = reiserfs_new_inode(&th, parent_dir, mode, name,
@@ -904,7 +943,7 @@
     reiserfs_update_inode_transaction(inode) ;
     reiserfs_update_inode_transaction(parent_dir) ;
 
-    inode->i_op = &page_symlink_inode_operations;
+    inode->i_op = &reiserfs_symlink_inode_operations;
     inode->i_mapping->a_ops = &reiserfs_address_space_operations;
 
     // must be sure this inode is written with this transaction
@@ -1277,5 +1316,25 @@
     rmdir:     reiserfs_rmdir,
     mknod:     reiserfs_mknod,
     rename:    reiserfs_rename,
+    setattr:   reiserfs_setattr, 
+    setxattr:   reiserfs_setxattr, 
+    getxattr:   reiserfs_getxattr, 
+    listxattr:   reiserfs_listxattr, 
+    removexattr:   reiserfs_removexattr, 
+    permission: reiserfs_permission,
 };
 
+/*
+ * symlink operations.. same as page_symlink_inode_operations, with xattr
+ * stuff added
+ */
+struct inode_operations reiserfs_symlink_inode_operations = {
+    readlink:       page_readlink,
+    follow_link:    page_follow_link,
+    setattr:        reiserfs_setattr,
+    setxattr:       reiserfs_setxattr,
+    getxattr:       reiserfs_getxattr,
+    listxattr:      reiserfs_listxattr,
+    removexattr:    reiserfs_removexattr,
+    permission: reiserfs_permission,
+};
diff -urN linux-2.4.22/fs/reiserfs/super.c linux-2.4.22-aclea/fs/reiserfs/super.c
--- linux-2.4.22/fs/reiserfs/super.c    2003-08-25 13:44:43.000000000 +0200
+++ linux-2.4.22-aclea/fs/reiserfs/super.c      2003-09-12 17:19:43.000000000 +0200
@@ -9,6 +9,9 @@
 #include <linux/vmalloc.h>
 #include <asm/uaccess.h>
 #include <linux/reiserfs_fs.h>
+#include <linux/reiserfs_fs_sb.h>
+#include <linux/reiserfs_acl.h>
+#include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 #include <linux/locks.h>
 #include <linux/init.h>
@@ -344,7 +346,17 @@
 {
   int i;
   struct reiserfs_transaction_handle th ;
+
+  if (s->u.reiserfs_sb.xattr_root) {
+    d_invalidate (s->u.reiserfs_sb.xattr_root);
+    dput (s->u.reiserfs_sb.xattr_root);
+  }
   
+  if (s->u.reiserfs_sb.priv_root) {
+    d_invalidate (s->u.reiserfs_sb.priv_root);
+    dput (s->u.reiserfs_sb.priv_root);
+  }
+
   /* change file system state to current state if it was mounted with read-write permissions */
   if (!(s->s_flags & MS_RDONLY)) {
     journal_begin(&th, s, 10) ;
@@ -408,6 +420,22 @@
     unlock_kernel() ;
 }
 
+static void reiserfs_clear_inode (struct inode *inode)
+{
+    struct posix_acl *acl;
+
+    acl = inode->u.reiserfs_i.i_acl_access;
+    if (acl && !IS_ERR (acl))
+        posix_acl_release (acl);
+    inode->u.reiserfs_i.i_acl_access = NULL;
+
+    acl = inode->u.reiserfs_i.i_acl_default;
+    if (acl && !IS_ERR (acl))
+        posix_acl_release (acl);
+    inode->u.reiserfs_i.i_acl_default = NULL;
+}
+
+
 struct super_operations reiserfs_sops = 
 {
   read_inode: reiserfs_read_inode,
@@ -415,6 +443,7 @@
   write_inode: reiserfs_write_inode,
   dirty_inode: reiserfs_dirty_inode,
   delete_inode: reiserfs_delete_inode,
+  clear_inode: reiserfs_clear_inode,
   put_super: reiserfs_put_super,
   write_super: reiserfs_write_super,
   write_super_lockfs: reiserfs_write_super_lockfs,
@@ -616,6 +645,16 @@
                {"resize", 'r', 0, 0, 0},
                {"attrs", 0, 0, 1<<REISERFS_ATTRS, 0},
                {"noattrs", 0, 0, 0, 1<<REISERFS_ATTRS},
+#ifdef CONFIG_REISERFS_FS_XATTR
+# ifdef CONFIG_REISERFS_FS_XATTR_USER
+               {"user_xattr", 0, 0, REISERFS_XATTRS_USER},
+               {"nouser_xattr", 0, 0, REISERFS_NO_XATTRS_USER},
+# endif
+# ifdef CONFIG_REISERFS_FS_POSIX_ACL
+               {"acl", 0, 0, REISERFS_POSIXACL},
+               {"noacl", 0, 0, REISERFS_NO_POSIXACL},
+# endif
+#endif
                {NULL, 0, 0, 0, 0}
     };
        
@@ -692,6 +731,10 @@
   safe_mask |= 1 << REISERFS_HASHED_RELOCATION;
   safe_mask |= 1 << REISERFS_TEST4;
   safe_mask |= 1 << REISERFS_ATTRS;
+  safe_mask |= 1 << REISERFS_XATTRS_USER;
+  safe_mask |= 1 << REISERFS_NO_XATTRS_USER;
+  safe_mask |= 1 << REISERFS_POSIXACL;
+  safe_mask |= 1 << REISERFS_NO_POSIXACL;
 
   /* Update the bitmask, taking care to keep
    * the bits we're not allowed to change here */
@@ -706,6 +749,7 @@
   }
 
   if (*mount_flags & MS_RDONLY) {
+    reiserfs_xattr_init (s, *mount_flags);
     /* remount read-only */
     if (s->s_flags & MS_RDONLY)
       /* it is read-only already */
@@ -723,8 +767,10 @@
     s->s_dirt = 0;
   } else {
     /* remount read-write */
-    if (!(s->s_flags & MS_RDONLY))
+    if (!(s->s_flags & MS_RDONLY)) {
+       reiserfs_xattr_init (s, *mount_flags);
        return 0; /* We are read-write already */
+    }
 
     s->s_flags &= ~MS_RDONLY ; /* now it is safe to call journal_begin */
     journal_begin(&th, s, 10) ;
@@ -743,8 +789,10 @@
   SB_JOURNAL(s)->j_must_wait = 1 ;
   journal_end(&th, s, 10) ;
 
-  if (!( *mount_flags & MS_RDONLY ) )
+  if (!( *mount_flags & MS_RDONLY ) ) {
     finish_unfinished( s );
+    reiserfs_xattr_init (s, *mount_flags);
+  }
 
   return 0;
 }
@@ -1169,6 +1217,8 @@
     s->u.reiserfs_sb.s_alloc_options.preallocmin = 4;
     /* Preallocate by 8 blocks (9-1) at once */
     s->u.reiserfs_sb.s_alloc_options.preallocsize = 9;
+    /* Initialize the rwsem for xattr dir */
+    init_rwsem(&s->u.reiserfs_sb.xattr_dir_sem);
 
     if (reiserfs_parse_options (s, (char *) data, &(s->u.reiserfs_sb.s_mount_opt), &blocks) == 0) {
       return NULL;
@@ -1301,11 +1351,23 @@
                
        journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB (s));
        journal_end(&th, s, 1) ;
-       
+
+       if (reiserfs_xattr_init (s, s->s_flags)) {
+           dput (s->s_root);
+           s->s_root = NULL;
+           goto error;
+       }
+
        /* look for files which were to be removed in previous session */
        finish_unfinished (s);
 
        s->s_dirt = 0;
+    } else {
+       if (reiserfs_xattr_init (s, s->s_flags)) {
+           dput (s->s_root);
+           s->s_root = NULL;
+           goto error;
+       }
     }
 
     // mark hash in super block: it could be unset. overwrite should be ok
@@ -1364,10 +1426,29 @@
 
 static int __init init_reiserfs_fs (void)
 {
+        int ret;
        reiserfs_proc_info_global_init();
        reiserfs_proc_register_global( "version", 
                                       reiserfs_global_version_in_proc );
-        return register_filesystem(&reiserfs_fs_type);
+       ret = reiserfs_xattr_user_init ();
+       if (ret) goto failed_xattr_user_init;
+
+       ret = reiserfs_xattr_trusted_init();
+       if (ret) goto failed_xattr_trusted_init;
+
+       ret = reiserfs_xattr_posix_acl_init();
+       if (ret) goto failed_xattr_posix_acl_init;
+
+       return register_filesystem(&reiserfs_fs_type);
+
+failed_xattr_posix_acl_init:
+       reiserfs_xattr_trusted_exit();
+failed_xattr_trusted_init:
+       reiserfs_xattr_user_exit();
+failed_xattr_user_init:
+       reiserfs_proc_unregister_global( "version" );
+       reiserfs_proc_info_global_done();
+       return ret;
 }
 
 MODULE_DESCRIPTION("ReiserFS journaled filesystem");
@@ -1377,6 +1458,9 @@
 
 static void __exit exit_reiserfs_fs(void)
 {
+       reiserfs_xattr_posix_acl_exit ();
+       reiserfs_xattr_trusted_exit ();
+       reiserfs_xattr_user_exit ();
        reiserfs_proc_unregister_global( "version" );
        reiserfs_proc_info_global_done();
         unregister_filesystem(&reiserfs_fs_type);
diff -urN linux-2.4.22/fs/reiserfs/xattr.c linux-2.4.22-aclea/fs/reiserfs/xattr.c
--- linux-2.4.22/fs/reiserfs/xattr.c    1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-aclea/fs/reiserfs/xattr.c      2003-09-12 17:19:37.000000000 +0200
@@ -0,0 +1,1266 @@
+/*
+ * linux/fs/reiserfs/xattr.c
+ *
+ * Copyright (c) 2002 by Jeff Mahoney, <jeffm@suse.com>
+ *
+ */
+
+/*
+ * In order to implement EA/ACLs in a clean, backwards compatible manner,
+ * they are implemented as files in a "private" directory.
+ * Each EA is in it's own file, with the directory layout like so (/ is assumed
+ * to be relative to fs root). Inside the /.reiserfs_priv/xattrs directory,
+ * directories named using the capital-hex form of the objectid and
+ * generation number are used. Inside each directory are individual files
+ * named with the name of the extended attribute.
+ *
+ * So, for objectid 12648430, we could have:
+ * /.reiserfs_priv/xattrs/C0FFEE.0/system.posix_acl_access
+ * /.reiserfs_priv/xattrs/C0FFEE.0/system.posix_acl_default
+ * /.reiserfs_priv/xattrs/C0FFEE.0/user.Content-Type
+ * .. or similar.
+ *
+ * The file contents are the text of the EA. The size is known based on the
+ * stat data describing the file.
+ *
+ * In the case of system.posix_acl_access and system.posix_acl_default, since
+ * these are special cases for filesystem ACLs, they are interpreted by the
+ * kernel, in addition, they are negatively and positively cached and attached
+ * to the inode so that unnecessary lookups are avoided.
+ */
+
+#include <linux/reiserfs_fs.h>
+#include <linux/dcache.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/file.h>
+#include <linux/pagemap.h>
+#include <linux/xattr.h>
+#include <linux/reiserfs_xattr.h>
+#include <linux/mbcache.h>
+#include <asm/uaccess.h>
+#include <asm/checksum.h>
+#include <linux/smp_lock.h>
+#include <linux/stat.h>
+#include <asm/semaphore.h>
+
+#define FL_READONLY 128
+#define FL_DIR_SEM_HELD 256
+#define PRIVROOT_NAME ".reiserfs_priv"
+#define XAROOT_NAME   "xattrs"
+
+static struct reiserfs_xattr_handler *find_xattr_handler_prefix (const char *prefix);
+
+static struct dentry *
+create_xa_root (struct super_block *sb)
+{
+    struct dentry *privroot = dget (sb->u.reiserfs_sb.priv_root);
+    struct dentry *xaroot;
+
+    /* This needs to be created at mount-time */
+    if (!privroot)
+        return ERR_PTR(-EOPNOTSUPP);
+
+    xaroot = lookup_one_len (XAROOT_NAME, privroot, strlen (XAROOT_NAME));
+    if (IS_ERR (xaroot)) {
+        goto out;
+    } else if (!xaroot->d_inode) {
+        int err;
+        down (&privroot->d_inode->i_sem);
+        err = privroot->d_inode->i_op->mkdir (privroot->d_inode, xaroot, 0700);
+        up (&privroot->d_inode->i_sem);
+
+        if (err) {
+            dput (xaroot);
+            dput (privroot);
+            return ERR_PTR (err);
+        }
+        sb->u.reiserfs_sb.xattr_root = dget (xaroot);
+    }
+
+out:
+    dput (privroot);
+    return xaroot;
+}
+
+/* This will return a dentry, or error, refering to the xa root directory.
+ * If the xa root doesn't exist yet, the dentry will be returned without
+ * an associated inode. This dentry can be used with ->mkdir to create
+ * the xa directory. */
+static struct dentry *
+__get_xa_root (struct super_block *s)
+{
+    struct dentry *privroot = dget (s->u.reiserfs_sb.priv_root);
+    struct dentry *xaroot = NULL;
+
+    if (IS_ERR (privroot) || !privroot)
+        return privroot;
+
+    xaroot = lookup_one_len (XAROOT_NAME, privroot, strlen (XAROOT_NAME));
+    if (IS_ERR (xaroot)) {
+        goto out;
+    } else if (!xaroot->d_inode) {
+        dput (xaroot);
+        xaroot = NULL;
+        goto out;
+    }
+
+    s->u.reiserfs_sb.xattr_root = dget (xaroot);
+
+out:
+    dput (privroot);
+    return xaroot;
+}
+
+/* Returns the dentry (or NULL) referring to the root of the extended
+ * attribute directory tree. If it has already been retreived, it is used.
+ * Otherwise, we attempt to retreive it from disk. It may also return
+ * a pointer-encoded error.
+ */
+static inline struct dentry *
+get_xa_root (struct super_block *s)
+{
+    struct dentry *dentry = s->u.reiserfs_sb.xattr_root;
+
+    if (!dentry)
+        dentry = __get_xa_root (s);
+    else
+        dget (dentry);
+    return dentry;
+}
+
+/* Same as above, but only returns a valid dentry or NULL */
+struct dentry *
+reiserfs_get_xa_root (struct super_block *sb)
+{
+    struct dentry *dentry;
+
+    dentry = get_xa_root (sb);
+    if (IS_ERR (dentry)) {
+        dentry = NULL;
+    } else if (dentry && !dentry->d_inode) {
+        dput (dentry);
+        dentry = NULL;
+    }
+
+    return dentry;
+}
+
+/* Opens the directory corresponding to the inode's extended attribute store.
+ * If flags allow, the tree to the directory may be created. If creation is
+ * prohibited, -ENODATA is returned. */
+static struct dentry *
+open_xa_dir (const struct inode *inode, int flags)
+{
+    struct dentry *xaroot, *xadir;
+    char namebuf[17];
+
+    xaroot = get_xa_root (inode->i_sb);
+    if (IS_ERR (xaroot)) {
+        return xaroot;
+    } else if (!xaroot) {
+        if (flags == 0 || flags & XATTR_CREATE) {
+            xaroot = create_xa_root (inode->i_sb);
+            if (IS_ERR (xaroot))
+                return xaroot;
+        }
+        if (!xaroot)
+            return ERR_PTR (-ENODATA);
+    }
+
+    /* ok, we have xaroot open */
+
+    snprintf (namebuf, sizeof (namebuf), "%X.%X",
+              le32_to_cpu (INODE_PKEY (inode)->k_objectid),
+              inode->i_generation);
+    xadir = lookup_one_len (namebuf, xaroot, strlen (namebuf));
+    if (IS_ERR (xadir)) {
+        dput (xaroot);
+        return xadir;
+    }
+    
+    if (!xadir->d_inode) {
+        int err;
+        if (flags == 0 || flags & XATTR_CREATE) {
+            /* Although there is nothing else trying to create this directory,
+             * another directory with the same hash may be created, so we need
+             * to protect against that */
+            err = xaroot->d_inode->i_op->mkdir (xaroot->d_inode, xadir, 0700);
+            if (err) {
+                dput (xaroot);
+                dput (xadir);
+                return ERR_PTR (err);
+            }
+        }
+        if (!xadir->d_inode) {
+            dput (xaroot);
+            dput (xadir);
+            return ERR_PTR (-ENODATA);
+        }
+    }
+
+    dput (xaroot);
+    return xadir;
+}
+
+/* Returns a dentry corresponding to a specific extended attribute file
+ * for the inode. If flags allow, the file is created. Otherwise, a
+ * valid or negative dentry, or an error is returned. */
+static struct dentry *
+get_xa_file_dentry (const struct inode *inode, const char *name, int flags)
+{
+    struct dentry *xadir, *xafile;
+    int err = 0;
+
+    xadir = open_xa_dir (inode, flags);
+    if (IS_ERR (xadir)) {
+        return ERR_PTR (PTR_ERR (xadir));
+    } else if (xadir && !xadir->d_inode) {
+        dput (xadir);
+        return ERR_PTR (-ENODATA);
+    }
+
+    xafile = lookup_one_len (name, xadir, strlen (name));
+    if (IS_ERR (xafile)) {
+        dput (xadir);
+        return ERR_PTR (PTR_ERR (xafile));
+    }
+
+    if (xafile->d_inode) { /* file exists */
+        if (flags & XATTR_CREATE) {
+            err = -EEXIST;
+            dput (xafile);
+            goto out;
+        }
+    } else if (flags & XATTR_REPLACE || flags & FL_READONLY) {
+        goto out;
+    } else {
+        /* inode->i_sem is down, so nothing else can try to create
+         * the same xattr */
+        err = xadir->d_inode->i_op->create (xadir->d_inode, xafile,
+                                            0700|S_IFREG);
+
+        if (err) {
+            dput (xafile);
+            goto out;
+        }
+    }
+
+out:
+    dput (xadir);
+    if (err)
+        xafile = ERR_PTR (err);
+    return xafile;
+}
+
+
+/* Opens a file pointer to the attribute associated with inode */
+static struct file *
+open_xa_file (const struct inode *inode, const char *name, int flags)
+{
+    struct dentry *xafile;
+    struct file *fp;
+
+    xafile = get_xa_file_dentry (inode, name, flags);
+    if (IS_ERR (xafile))
+        return ERR_PTR (PTR_ERR (xafile));
+    else if (!xafile->d_inode) {
+        dput (xafile);
+        return ERR_PTR (-ENODATA);
+    }
+
+    fp = dentry_open (xafile, NULL, O_RDWR);
+    /* dentry_open dputs the dentry if it fails */
+
+    return fp;
+}
+
+
+/*
+ * this is very similar to fs/reiserfs/dir.c:reiserfs_readdir, but
+ * we need to drop the path before calling the filldir struct.  That
+ * would be a big performance hit to the non-xattr case, so I've copied
+ * the whole thing for now. --clm
+ *
+ * the big difference is that I go backwards through the directory, 
+ * and don't mess with f->f_pos, but the idea is the same.  Do some
+ * action on each and every entry in the directory.
+ *
+ * we're called with i_sem held, so there are no worries about the directory
+ * changing underneath us.
+ */
+static int __xattr_readdir(struct file * filp, void * dirent, filldir_t filldir)
+{
+    struct inode *inode = filp->f_dentry->d_inode;
+    struct cpu_key pos_key;    /* key of current position in the directory (key of directory entry) */
+    INITIALIZE_PATH (path_to_entry);
+    struct buffer_head * bh;
+    int entry_num;
+    struct item_head * ih, tmp_ih;
+    int search_res;
+    char * local_buf;
+    loff_t next_pos;
+    char small_buf[32] ; /* avoid kmalloc if we can */
+    struct reiserfs_de_head *deh;
+    int d_reclen;
+    char * d_name;
+    off_t d_off;
+    ino_t d_ino;
+    struct reiserfs_dir_entry de;
+
+
+    /* form key for search the next directory entry using f_pos field of
+       file structure */
+    next_pos = max_reiserfs_offset(inode);
+
+    while (1) {
+research:
+       if (next_pos <= DOT_DOT_OFFSET)
+           break;
+       make_cpu_key (&pos_key, inode, next_pos, TYPE_DIRENTRY, 3);
+
+       search_res = search_by_entry_key(inode->i_sb, &pos_key, &path_to_entry, &de);
+       if (search_res == IO_ERROR) {
+           // FIXME: we could just skip part of directory which could
+           // not be read
+           pathrelse(&path_to_entry);
+           return -EIO;
+       }
+
+       if (search_res == NAME_NOT_FOUND)
+           de.de_entry_num--;
+
+       set_de_name_and_namelen(&de);
+       entry_num = de.de_entry_num;
+       deh = &(de.de_deh[entry_num]);
+
+       bh = de.de_bh;
+       ih = de.de_ih;
+
+       if (!is_direntry_le_ih(ih)) {
+reiserfs_warning(inode->i_sb, "not direntry %h\n", ih);
+           break;
+        }
+       copy_item_head(&tmp_ih, ih);
+               
+       /* we must have found item, that is item of this directory, */
+       RFALSE( COMP_SHORT_KEYS (&(ih->ih_key), &pos_key),
+               "vs-9000: found item %h does not match to dir we readdir %K",
+               ih, &pos_key);
+
+       if (deh_offset(deh) <= DOT_DOT_OFFSET) {
+           break;
+       }
+
+       /* look for the previous entry in the directory */
+       next_pos = deh_offset (deh) - 1;
+
+       if (!de_visible (deh))
+           /* it is hidden entry */
+           continue;
+
+       d_reclen = entry_length(bh, ih, entry_num);
+       d_name = B_I_DEH_ENTRY_FILE_NAME (bh, ih, deh);
+       d_off = deh_offset (deh);
+       d_ino = deh_objectid (deh);
+
+       if (!d_name[d_reclen - 1])
+           d_reclen = strlen (d_name);
+
+       if (d_reclen > REISERFS_MAX_NAME(inode->i_sb->s_blocksize)){
+           /* too big to send back to VFS */
+           continue ;
+       }
+
+        /* Ignore the .reiserfs_priv entry */
+        if (reiserfs_xattrs (inode->i_sb) && 
+            !old_format_only(inode->i_sb) &&
+            deh_objectid (deh) == le32_to_cpu (INODE_PKEY(inode->i_sb->u.reiserfs_sb.priv_root->d_inode)->k_objectid))
+          continue;
+
+       if (d_reclen <= 32) {
+         local_buf = small_buf ;
+       } else {
+           local_buf = reiserfs_kmalloc(d_reclen, GFP_NOFS, inode->i_sb) ;
+           if (!local_buf) {
+               pathrelse (&path_to_entry);
+               return -ENOMEM ;
+           }
+           if (item_moved (&tmp_ih, &path_to_entry)) {
+               reiserfs_kfree(local_buf, d_reclen, inode->i_sb) ;
+
+               /* sigh, must retry.  Do this same offset again */
+               next_pos = d_off;
+               goto research;
+           }
+       }
+
+       // Note, that we copy name to user space via temporary
+       // buffer (local_buf) because filldir will block if
+       // user space buffer is swapped out. At that time
+       // entry can move to somewhere else
+       memcpy (local_buf, d_name, d_reclen);
+
+       /* the filldir function might need to start transactions,
+        * or do who knows what.  Release the path now that we've
+        * copied all the important stuff out of the deh
+        */
+       pathrelse (&path_to_entry);
+
+       if (filldir (dirent, local_buf, d_reclen, d_off, d_ino, 
+                    DT_UNKNOWN) < 0) {
+           if (local_buf != small_buf) {
+               reiserfs_kfree(local_buf, d_reclen, inode->i_sb) ;
+           }
+           goto end;
+       }
+       if (local_buf != small_buf) {
+           reiserfs_kfree(local_buf, d_reclen, inode->i_sb) ;
+       }
+    } /* while */
+
+end:
+    pathrelse (&path_to_entry);
+    return 0;
+}
+
+/* 
+ * this could be done with dedicated readdir ops for the xattr files,
+ * but I want to get something working asap
+ * this is stolen from vfs_readdir
+ *
+ */
+static
+int xattr_readdir(struct file *file, filldir_t filler, void *buf)
+{
+        struct inode *inode = file->f_dentry->d_inode;
+        int res = -ENOTDIR;
+        if (!file->f_op || !file->f_op->readdir)
+                goto out;
+        down(&inode->i_sem);
+        down(&inode->i_zombie);
+        res = -ENOENT;
+        if (!IS_DEADDIR(inode)) {
+                lock_kernel();
+                res = __xattr_readdir(file, buf, filler);
+                unlock_kernel();
+        }
+        up(&inode->i_zombie);
+        up(&inode->i_sem);
+out:
+        return res;
+}
+
+
+/* Internal operations on file data */
+static inline void
+reiserfs_put_page(struct page *page)
+{
+        kunmap(page);
+        page_cache_release(page);
+}
+
+static struct page *
+reiserfs_get_page(struct inode *dir, unsigned long n)
+{
+        struct address_space *mapping = dir->i_mapping; 
+        struct page *page;
+        /* We can deadlock if we try to free dentries,
+           and an unlink/rmdir has just occured - GFP_NOFS avoids this */
+        mapping->gfp_mask = GFP_NOFS;
+        page = read_cache_page (mapping, n,
+                                (filler_t*)mapping->a_ops->readpage, NULL);
+        if (!IS_ERR(page)) {
+                wait_on_page(page);
+                kmap(page);
+                if (!Page_Uptodate(page))
+                        goto fail;
+
+                if (PageError(page))
+                        goto fail;
+        }
+        return page;
+
+fail:
+        reiserfs_put_page(page);
+        return ERR_PTR(-EIO);
+}
+
+static inline __u32
+xattr_hash (const char *msg, int len)
+{
+    return csum_partial (msg, len, 0);
+}
+
+/* Generic extended attribute operations that can be used by xa plugins */
+
+/*
+ * inode->i_sem: down
+ */
+int
+reiserfs_xattr_set (struct inode *inode, const char *name, const void *buffer,
+                    size_t buffer_size, int flags)
+{
+    int err = 0;
+    struct file *fp;
+    struct page *page;
+    char *data;
+    struct address_space *mapping;
+    size_t file_pos = 0;
+    size_t buffer_pos = 0;
+    struct inode *xinode;
+    struct iattr newattrs;
+    __u32 xahash = 0;
+
+    if (get_inode_sd_version (inode) == STAT_DATA_V1)
+        return -EOPNOTSUPP;
+
+    /* Empty xattrs are ok, they're just empty files, no hash */
+    if (buffer && buffer_size)
+        xahash = xattr_hash (buffer, buffer_size);
+
+open_file:
+    fp = open_xa_file (inode, name, flags);
+    if (IS_ERR (fp)) {
+        err = PTR_ERR (fp);
+        goto out;
+    }
+
+    xinode = fp->f_dentry->d_inode;
+
+    /* we need to copy it off.. */
+    if (xinode->i_nlink > 1) {
+       fput(fp);
+        err = reiserfs_xattr_del (inode, name);
+        if (err < 0)
+            goto out;
+        /* We just killed the old one, we're not replacing anymore */
+        if (flags & XATTR_REPLACE)
+            flags &= ~XATTR_REPLACE;
+        goto open_file;
+    }
+
+    /* Resize it so we're ok to write there */
+    newattrs.ia_size = buffer_size;
+    newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+    down (&xinode->i_sem);
+    err = notify_change(fp->f_dentry, &newattrs);
+    if (err)
+        goto out_filp;
+
+    mapping = xinode->i_mapping;
+    while (buffer_pos < buffer_size || buffer_pos == 0) {
+        size_t chunk;
+        size_t skip = 0;
+        size_t page_offset = (file_pos & (PAGE_CACHE_SIZE - 1));
+        if (buffer_size - buffer_pos > PAGE_CACHE_SIZE)
+            chunk = PAGE_CACHE_SIZE;
+        else
+            chunk = buffer_size - buffer_pos;
+
+        page = reiserfs_get_page (xinode, file_pos >> PAGE_CACHE_SHIFT);
+        if (IS_ERR (page)) {
+            err = PTR_ERR (page);
+            goto out_filp;
+        }
+
+        lock_page (page);
+        data = page_address (page);
+
+        if (file_pos == 0) {
+            struct reiserfs_xattr_header *rxh;
+            skip = file_pos = sizeof (struct reiserfs_xattr_header);
+            if (chunk + skip > PAGE_CACHE_SIZE)
+                chunk = PAGE_CACHE_SIZE - skip;
+            rxh = (struct reiserfs_xattr_header *)data;
+            rxh->h_magic = cpu_to_le32 (REISERFS_XATTR_MAGIC);
+            rxh->h_hash = cpu_to_le32 (xahash);
+        }
+
+        err = mapping->a_ops->prepare_write (fp, page, page_offset,
+                                             page_offset + chunk + skip);
+        if (!err) {
+           if (buffer)
+               memcpy (data + skip, buffer + buffer_pos, chunk);
+            err = mapping->a_ops->commit_write (fp, page, page_offset,
+                                                page_offset + chunk + skip);
+       }
+        UnlockPage (page);
+        reiserfs_put_page (page);
+        buffer_pos += chunk;
+        file_pos += chunk;
+        skip = 0;
+        if (err || buffer_size == 0 || !buffer)
+            break;
+    }
+
+out_filp:
+    up (&xinode->i_sem);
+    fput(fp);
+
+out:
+    return err;
+}
+
+/*
+ * inode->i_sem: down
+ */
+int
+reiserfs_xattr_get (const struct inode *inode, const char *name, void *buffer,
+                    size_t buffer_size)
+{
+    ssize_t err = 0;
+    struct file *fp;
+    size_t isize;
+    size_t file_pos = 0;
+    size_t buffer_pos = 0;
+    struct page *page;
+    struct inode *xinode;
+    __u32 hash = 0;
+
+    /* We can't have xattrs attached to v1 items since they don't have
+     * generation numbers */
+    if (get_inode_sd_version (inode) == STAT_DATA_V1)
+        return -EOPNOTSUPP;
+
+    fp = open_xa_file (inode, name, FL_READONLY);
+    if (IS_ERR (fp)) {
+        err = PTR_ERR (fp);
+        goto out;
+    }
+
+    xinode = fp->f_dentry->d_inode;
+    isize = xinode->i_size;
+
+    /* Just return the size needed */
+    if (buffer == NULL) {
+        err = isize - sizeof (struct reiserfs_xattr_header);
+        goto out_dput;
+    }
+
+    if (buffer_size < isize - sizeof (struct reiserfs_xattr_header)) {
+        err = -ERANGE;
+        goto out_dput;
+    }
+    
+    while (file_pos < isize) {
+        size_t chunk;
+        char *data;
+        size_t skip = 0;
+        if (isize - file_pos > PAGE_CACHE_SIZE)
+            chunk = PAGE_CACHE_SIZE;
+        else
+            chunk = isize - file_pos;
+
+        page = reiserfs_get_page (xinode, file_pos >> PAGE_CACHE_SHIFT);
+        if (IS_ERR (page)) {
+            err = PTR_ERR (page);
+            goto out_dput;
+        }
+
+        lock_page (page);
+        data = page_address (page);
+        if (file_pos == 0) {
+            struct reiserfs_xattr_header *rxh =
+                                        (struct reiserfs_xattr_header *)data;
+            skip = file_pos = sizeof (struct reiserfs_xattr_header);
+            chunk -= skip;
+            /* Magic doesn't match up.. */
+            if (rxh->h_magic != cpu_to_le32 (REISERFS_XATTR_MAGIC)) {
+                UnlockPage (page);
+                reiserfs_put_page (page);
+                err = -EIO;
+                goto out_dput;
+            }
+            hash = le32_to_cpu (rxh->h_hash);
+        }
+        memcpy (buffer + buffer_pos, data + skip, chunk);
+        UnlockPage (page);
+        reiserfs_put_page (page);
+        file_pos += chunk;
+        buffer_pos += chunk;
+        skip = 0;
+    }
+    err = isize - sizeof (struct reiserfs_xattr_header);
+
+    if (xattr_hash (buffer, isize - sizeof (struct reiserfs_xattr_header)) != hash)
+        err = -EIO;
+
+out_dput:
+    fput(fp);
+
+out:
+    return err;
+}
+
+static int
+__reiserfs_xattr_del (struct dentry *xadir, const char *name, int namelen)
+{
+    struct dentry *file;
+    struct inode *dir = xadir->d_inode;
+    int err = 0;
+
+    file = lookup_one_len (name, xadir, namelen);
+    if (IS_ERR (file)) {
+        err = PTR_ERR (file);
+        goto out;
+    } else if (!file->d_inode) {
+        err = -ENODATA;
+        goto out_file;
+    }
+
+    /* Skip directories.. */
+    if (S_ISDIR (file->d_inode->i_mode))
+        goto out_file;
+
+    if (!is_reiserfs_priv_object (file->d_inode)) {
+        reiserfs_warning (file->d_inode->i_sb, "trying to delete objectid %08x, which isn't an xattr!\n", le32_to_cpu (INODE_PKEY (file->d_inode)->k_objectid));
+        dput (file);
+        return -EIO;
+    }
+
+    err = dir->i_op->unlink (dir, file);
+    if (!err)
+        d_delete (file);
+
+out_file:
+    dput (file);
+
+out:
+    return err;
+}
+
+
+int
+reiserfs_xattr_del (struct inode *inode, const char *name)
+{
+    struct dentry *dir;
+    int err;
+
+    dir = open_xa_dir (inode, FL_READONLY);
+    if (IS_ERR (dir)) {
+        err = PTR_ERR (dir);
+        goto out;
+    }
+
+    err = __reiserfs_xattr_del (dir, name, strlen (name));
+    dput (dir);
+
+out:
+    return err;
+}
+
+/* The following are side effects of other operations that aren't explicitly
+ * modifying extended attributes. This includes operations such as permissions
+ * or ownership changes, object deletions, etc. */
+ 
+static int
+reiserfs_delete_xattrs_filler (void *buf, const char *name, int namelen,
+                               loff_t offset, ino_t ino, unsigned int d_type)
+{
+    struct dentry *xadir = (struct dentry *)buf;
+
+    return __reiserfs_xattr_del (xadir, name, namelen);
+
+}
+
+int
+reiserfs_delete_xattrs (struct inode *inode)
+{
+    struct file *fp;
+    struct dentry *dir, *root;
+    int err = 0;
+
+    /* Skip out, an xattr has no xattrs associated with it */
+    if (is_reiserfs_priv_object (inode) ||
+        get_inode_sd_version (inode) == STAT_DATA_V1 || 
+        !reiserfs_xattrs(inode->i_sb))
+    {
+        return 0;
+    }
+    reiserfs_read_lock_xattrs (inode->i_sb);
+    dir = open_xa_dir (inode, FL_READONLY);
+    reiserfs_read_unlock_xattrs (inode->i_sb);
+    if (IS_ERR (dir)) {
+        err = PTR_ERR (dir);
+        goto out;
+    } else if (!dir->d_inode) {
+        dput (dir);
+        return 0;
+    }
+
+    fp = dentry_open (dir, NULL, O_RDWR);
+    if (IS_ERR (fp)) {
+        err = PTR_ERR (fp);
+        /* dentry_open dputs the dentry if it fails */
+        goto out;
+    }
+
+    lock_kernel ();
+    err = xattr_readdir (fp, reiserfs_delete_xattrs_filler, dir);
+    if (err) {
+        unlock_kernel ();
+        goto out_dir;
+    }
+
+    /* Leftovers besides . and .. -- that's not good. */
+    if (dir->d_inode->i_nlink <= 2) {
+        root = get_xa_root (inode->i_sb);
+        reiserfs_write_lock_xattrs (inode->i_sb);
+        err = vfs_rmdir (root->d_inode, dir);
+        reiserfs_write_unlock_xattrs (inode->i_sb);
+        dput (root);
+    } else {
+        reiserfs_warning (inode->i_sb, "Couldn't remove all entries in directory\n");
+    }
+    unlock_kernel ();
+
+out_dir:
+    fput(fp);
+
+out:
+    return err;
+}
+
+struct reiserfs_chown_buf {
+    struct inode *inode;
+    struct dentry *xadir;
+    struct iattr *attrs;
+};
+
+/* XXX: If there is a better way to do this, I'd love to hear about it */
+static int
+reiserfs_chown_xattrs_filler (void *buf, const char *name, int namelen,
+                               loff_t offset, ino_t ino, unsigned int d_type)
+{
+    struct reiserfs_chown_buf *chown_buf = (struct reiserfs_chown_buf *)buf;
+    struct dentry *xafile, *xadir = chown_buf->xadir;
+    struct iattr *attrs = chown_buf->attrs;
+    int err = 0;
+
+    xafile = lookup_one_len (name, xadir, namelen);
+    if (IS_ERR (xafile))
+        return PTR_ERR (xafile);
+    else if (!xafile->d_inode) {
+        dput (xafile);
+        return -ENODATA;
+    }
+
+    if (!S_ISDIR (xafile->d_inode->i_mode))
+        err = notify_change (xafile, attrs);
+    dput (xafile);
+
+    return err;
+}
+
+int
+reiserfs_chown_xattrs (struct inode *inode, struct iattr *attrs)
+{
+    struct file *fp;
+    struct dentry *dir;
+    int err = 0;
+    struct reiserfs_chown_buf buf;
+    unsigned int ia_valid = attrs->ia_valid;
+
+    /* Skip out, an xattr has no xattrs associated with it */
+    if (is_reiserfs_priv_object (inode) ||
+        get_inode_sd_version (inode) == STAT_DATA_V1 || 
+        !reiserfs_xattrs(inode->i_sb))
+    {
+        return 0;
+    }
+    reiserfs_read_lock_xattrs (inode->i_sb);
+    dir = open_xa_dir (inode, FL_READONLY);
+    reiserfs_read_unlock_xattrs (inode->i_sb);
+    if (IS_ERR (dir)) {
+        if (PTR_ERR (dir) != -ENODATA)
+            err = PTR_ERR (dir);
+        goto out;
+    } else if (!dir->d_inode) {
+        dput (dir);
+        goto out;
+    }
+
+    fp = dentry_open (dir, NULL, O_RDWR);
+    if (IS_ERR (fp)) {
+        err = PTR_ERR (fp);
+        /* dentry_open dputs the dentry if it fails */
+        goto out;
+    }
+
+    lock_kernel ();
+
+    attrs->ia_valid &= (ATTR_UID | ATTR_GID | ATTR_CTIME);
+    buf.xadir = dir;
+    buf.attrs = attrs;
+    buf.inode = inode;
+
+    err = xattr_readdir (fp, reiserfs_chown_xattrs_filler, &buf);
+    if (err) {
+        unlock_kernel ();
+        goto out_dir;
+    }
+
+    err = notify_change (dir, attrs);
+    unlock_kernel ();
+
+out_dir:
+    fput(fp);
+
+out:
+    attrs->ia_valid = ia_valid;
+    return err;
+}
+
+
+/* Actual operations that are exported to VFS-land */
+
+/*
+ * Inode operation getxattr()
+ * dentry->d_inode->i_sem down
+ * BKL held [before 2.5.x]
+ */
+ssize_t
+reiserfs_getxattr (struct dentry *dentry, const char *name, void *buffer,
+                   size_t size)
+{
+    struct reiserfs_xattr_handler *xah = find_xattr_handler_prefix (name);
+    int err;
+
+    if (!xah || !reiserfs_xattrs(dentry->d_sb) ||
+        get_inode_sd_version (dentry->d_inode) == STAT_DATA_V1)
+        return -EOPNOTSUPP;
+    
+    reiserfs_read_lock_xattrs (dentry->d_sb);
+    err = xah->get (dentry->d_inode, name, buffer, size);
+    reiserfs_read_unlock_xattrs (dentry->d_sb);
+    return err;
+}
+
+
+/*
+ * Inode operation setxattr()
+ *
+ * dentry->d_inode->i_sem down
+ * BKL held [before 2.5.x]
+ */
+int
+reiserfs_setxattr (struct dentry *dentry, const char *name, const void *value,
+                   size_t size, int flags)
+{
+    struct reiserfs_xattr_handler *xah = find_xattr_handler_prefix (name);
+    int err;
+
+    if (!xah || !reiserfs_xattrs(dentry->d_sb) ||
+        get_inode_sd_version (dentry->d_inode) == STAT_DATA_V1)
+        return -EOPNOTSUPP;
+    
+    
+    reiserfs_write_lock_xattrs (dentry->d_sb);
+    err = xah->set (dentry->d_inode, name, value, size, flags);
+    reiserfs_write_unlock_xattrs (dentry->d_sb);
+    return err;
+}
+
+/*
+ * Inode operation removexattr()
+ *
+ * dentry->d_inode->i_sem down
+ * BKL held [before 2.5.x]
+ */
+int
+reiserfs_removexattr (struct dentry *dentry, const char *name)
+{
+    int err;
+    struct reiserfs_xattr_handler *xah = find_xattr_handler_prefix (name);
+
+    if (!xah || !reiserfs_xattrs(dentry->d_sb) ||
+        get_inode_sd_version (dentry->d_inode) == STAT_DATA_V1)
+        return -EOPNOTSUPP;
+
+    down (&dentry->d_inode->i_zombie);
+    reiserfs_read_lock_xattrs (dentry->d_sb);
+
+    /* Deletion pre-operation */
+    if (xah->del) {
+        err = xah->del (dentry->d_inode, name);
+        if (err) {
+            reiserfs_read_unlock_xattrs (dentry->d_sb);
+            up (&dentry->d_inode->i_zombie);
+            return err;
+        }
+    }
+
+    err = reiserfs_xattr_del (dentry->d_inode, name);
+    reiserfs_read_unlock_xattrs (dentry->d_sb);
+    up (&dentry->d_inode->i_zombie);
+    return err;
+}
+
+
+/* This is what filldir will use:
+ * r_pos will always contain the amount of space required for the entire
+ * list. If r_pos becomes larger than r_size, we need more space and we
+ * return an error indicating this. If r_pos is less than r_size, then we've
+ * filled the buffer successfully and we return success */
+struct reiserfs_listxattr_buf {
+    int r_pos;
+    int r_size;
+    char *r_buf;
+    struct inode *r_inode;
+};
+
+static int
+reiserfs_listxattr_filler (void *buf, const char *name, int namelen,
+                           loff_t offset, ino_t ino, unsigned int d_type)
+{
+    struct reiserfs_listxattr_buf *b = (struct reiserfs_listxattr_buf *)buf;
+    int len = 0;
+    if (name[0] != '.' || (namelen != 1 && (name[1] != '.' || namelen != 2))) {
+        struct reiserfs_xattr_handler *xah = find_xattr_handler_prefix (name);
+        if (!xah) return 0; /* Unsupported xattr name, skip it */
+
+        /* We call ->list() twice because the operation isn't required to just
+         * return the name back - we want to make sure we have enough space */
+        len += xah->list (b->r_inode, name, namelen, NULL);
+
+        if (len) {
+            if (b->r_pos + len + 1 <= b->r_size) {
+                char *p = b->r_buf + b->r_pos;
+                p += xah->list (b->r_inode, name, namelen, p);
+                *p++ = '\0';
+            }
+            b->r_pos += len + 1;
+        }
+    }
+
+    return 0;
+}
+/*
+ * Inode operation listxattr()
+ *
+ * dentry->d_inode->i_sem down
+ * BKL held [before 2.5.x]
+ */
+ssize_t
+reiserfs_listxattr (struct dentry *dentry, char *buffer, size_t size)
+{
+    struct file *fp;
+    struct dentry *dir;
+    int err = 0;
+    struct reiserfs_listxattr_buf buf;
+
+    if (!dentry->d_inode)
+        return -EINVAL;
+
+    if (!reiserfs_xattrs(dentry->d_sb) ||
+        get_inode_sd_version (dentry->d_inode) == STAT_DATA_V1)
+        return -EOPNOTSUPP;
+
+    reiserfs_read_lock_xattrs (dentry->d_sb);
+    dir = open_xa_dir (dentry->d_inode, FL_READONLY);
+    reiserfs_read_unlock_xattrs (dentry->d_sb);
+    if (IS_ERR (dir)) {
+        err = PTR_ERR (dir);
+        if (err == -ENODATA)
+            err = 0; /* Not an error if there aren't any xattrs */
+        goto out;
+    }
+
+    fp = dentry_open (dir, NULL, O_RDWR);
+    if (IS_ERR (fp)) {
+        err = PTR_ERR (fp);
+        /* dentry_open dputs the dentry if it fails */
+        goto out;
+    }
+
+    buf.r_buf = buffer;
+    buf.r_size = buffer ? size : 0;
+    buf.r_pos = 0;
+    buf.r_inode = dentry->d_inode;
+
+    err = xattr_readdir (fp, reiserfs_listxattr_filler, &buf);
+    if (err)
+        goto out_dir;
+
+    if (buf.r_pos > buf.r_size && buffer != NULL)
+        err = -ERANGE;
+    else
+        err = buf.r_pos;
+
+out_dir:
+    fput(fp);
+
+out:
+    return err;
+}
+
+/* This is the implementation for the xattr plugin infrastructure */
+static struct reiserfs_xattr_handler *xattr_handlers;
+static rwlock_t handler_lock = RW_LOCK_UNLOCKED;
+
+static struct reiserfs_xattr_handler *
+find_xattr_handler_prefix (const char *prefix)
+{
+    struct reiserfs_xattr_handler **xah;
+    read_lock (&handler_lock);
+    for (xah = &xattr_handlers; *xah; xah=&(*xah)->next)
+        if (strncmp ((*xah)->prefix, prefix, strlen ((*xah)->prefix)) == 0)
+            break;
+    read_unlock (&handler_lock);
+    return *xah;
+}
+
+int
+reiserfs_xattr_register_handler (struct reiserfs_xattr_handler *handler)
+{
+    int res = 0;
+    struct reiserfs_xattr_handler **xah;
+
+    if (!handler)
+        return -EINVAL;
+
+    if (handler->next)
+        return -EBUSY;
+
+    write_lock (&handler_lock);
+
+    for (xah = &xattr_handlers; *xah; xah=&(*xah)->next) {
+        if (strcmp ((*xah)->prefix, handler->prefix) == 0)
+            break;
+    }
+    if (*xah)
+        res = -EBUSY;
+    else
+        *xah = handler;
+
+    /*
+    if (!res)
+        printk ("ReiserFS: Registered xattr handler for %s\n", handler->prefix);
+    */
+
+    write_unlock (&handler_lock);
+    return res;
+}
+
+int
+reiserfs_xattr_unregister_handler (struct reiserfs_xattr_handler *handler)
+{
+    struct reiserfs_xattr_handler **xah;
+    write_lock (&handler_lock);
+
+    xah = &xattr_handlers;
+    while (*xah) {
+        if (handler == *xah) {
+            *xah = handler->next;
+            handler->next = NULL;
+            write_unlock (&handler_lock);
+            /*
+            printk ("ReiserFS: Unregistered xattr handler for %s\n",
+                    handler->prefix);
+            */
+            return 0;
+        }
+        xah = &(*xah)->next;
+    }
+    write_unlock (&handler_lock);
+    return -EINVAL;
+}
+
+/* We need to take a copy of the mount flags since things like
+ * MS_RDONLY don't get set until *after* we're called.
+ * mount_flags != mount_options */
+
+int
+reiserfs_xattr_init (struct super_block *s, int mount_flags)
+{
+  int err = 0;
+
+  /* I hate using the _NO_ variant to clear bits. We use the normal variant
+   * everywhere else, so just clear them both here */
+  if (test_bit (REISERFS_NO_XATTRS_USER, &(s->u.reiserfs_sb.s_mount_opt))) {
+    clear_bit (REISERFS_XATTRS_USER, &(s->u.reiserfs_sb.s_mount_opt));
+    clear_bit (REISERFS_NO_XATTRS_USER, &(s->u.reiserfs_sb.s_mount_opt));
+  }
+
+  if (test_bit (REISERFS_NO_POSIXACL, &(s->u.reiserfs_sb.s_mount_opt))) {
+    clear_bit (REISERFS_POSIXACL, &(s->u.reiserfs_sb.s_mount_opt));
+    clear_bit (REISERFS_NO_POSIXACL, &(s->u.reiserfs_sb.s_mount_opt));
+  }
+
+  /* If the user has requested an optional xattrs type (e.g. user/acl), then
+   * enable xattrs. If we're a v3.5 filesystem, this will get caught and
+   * error out. If no optional xattrs are enabled, disable xattrs */
+  if (reiserfs_xattrs_optional (s))
+    set_bit (REISERFS_XATTRS, &(s->u.reiserfs_sb.s_mount_opt));
+  else
+    clear_bit (REISERFS_XATTRS, &(s->u.reiserfs_sb.s_mount_opt));
+
+  if (reiserfs_xattrs (s)) {
+    /* We need generation numbers to ensure that the oid mapping is correct
+     * v3.5 filesystems don't have them. */
+    if (old_format_only (s)) {
+      reiserfs_warning (s, "reiserfs: xattrs/ACLs not supported on pre v3.6 "
+                        "format filesystem. Failing mount.\n");
+      err = -EOPNOTSUPP;
+      goto error;
+    } else if (!s->u.reiserfs_sb.priv_root) {
+      struct dentry *dentry;
+      dentry = lookup_one_len (PRIVROOT_NAME, s->s_root,
+                               strlen (PRIVROOT_NAME));
+      if (!IS_ERR (dentry)) {
+        if (!(mount_flags & MS_RDONLY) && !dentry->d_inode) {
+            struct inode *inode = dentry->d_parent->d_inode;
+            down (&inode->i_sem);
+            err = inode->i_op->mkdir (inode, dentry, 0700);
+            up (&inode->i_sem);
+            if (err) {
+                dput (dentry);
+                dentry = NULL;
+            }
+
+            if (dentry && dentry->d_inode)
+                reiserfs_warning (s, "reiserfs: Created %s on %s - reserved for "
+                                  "xattr storage.\n", PRIVROOT_NAME, 
+                                  bdevname (inode->i_sb->s_dev));
+        }
+      } else
+        err = PTR_ERR (dentry);
+
+      if (!err) {
+          d_drop (dentry);
+          dentry->d_inode->u.reiserfs_i.i_flags |= i_priv_object;
+          s->u.reiserfs_sb.priv_root = dentry;
+      } else { /* xattrs are unavailable */
+          /* If we're read-only it just means that the dir hasn't been
+           * created. Not an error -- just no xattrs on the fs. We'll
+           * check again if we go read-write */
+          if (!(mount_flags & MS_RDONLY)) {
+              reiserfs_warning (s, "reiserfs: xattrs/ACLs enabled and couldn't "
+                             "find/create .reiserfs_priv. Failing mount.\n");
+            err = -EOPNOTSUPP;
+            goto error;
+          }
+          /* Just to speed things up a bit since it won't find anything and
+           * we're read-only */
+          clear_bit (REISERFS_XATTRS, &(s->u.reiserfs_sb.s_mount_opt));
+          clear_bit (REISERFS_XATTRS_USER, &(s->u.reiserfs_sb.s_mount_opt));
+          clear_bit (REISERFS_POSIXACL, &(s->u.reiserfs_sb.s_mount_opt));
+      }
+    }
+  }
+
+error:
+   /* This is only nonzero if there was an error initializing the xattr
+    * directory or if there is a condition where we don't support them. */
+
+    if (err) {
+          clear_bit (REISERFS_XATTRS, &(s->u.reiserfs_sb.s_mount_opt));
+          clear_bit (REISERFS_XATTRS_USER, &(s->u.reiserfs_sb.s_mount_opt));
+          clear_bit (REISERFS_POSIXACL, &(s->u.reiserfs_sb.s_mount_opt));
+    }
+
+    s->s_flags = (s->s_flags & ~MS_POSIXACL) |
+                 (reiserfs_posixacl (s) ? MS_POSIXACL : 0);
+    return err;
+}
diff -urN linux-2.4.22/fs/reiserfs/xattr_acl.c linux-2.4.22-aclea/fs/reiserfs/xattr_acl.c
--- linux-2.4.22/fs/reiserfs/xattr_acl.c        1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-aclea/fs/reiserfs/xattr_acl.c  2003-09-12 17:19:37.000000000 +0200
@@ -0,0 +1,653 @@
+#include <linux/posix_acl.h>
+#include <linux/reiserfs_fs.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/pagemap.h>
+#include <linux/xattr.h>
+#include <linux/xattr_acl.h>
+#include <linux/reiserfs_xattr.h>
+#include <linux/reiserfs_acl.h>
+#include <asm/uaccess.h>
+
+static int
+xattr_set_acl(struct inode *inode, int type, const void *value, size_t size)
+{
+       struct posix_acl *acl;
+       int error;
+
+       if (!reiserfs_posixacl(inode->i_sb))
+               return -EOPNOTSUPP;
+       if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+               return -EPERM;
+
+       if (value) {
+               acl = posix_acl_from_xattr(value, size);
+               if (IS_ERR(acl)) {
+                       return PTR_ERR(acl);
+               } else if (acl) {
+                       error = posix_acl_valid(acl);
+                       if (error)
+                               goto release_and_out;
+               }
+       } else
+               acl = NULL;
+
+       error = reiserfs_set_acl (inode, type, acl);
+
+release_and_out:
+       posix_acl_release(acl);
+       return error;
+}
+
+
+static int
+xattr_get_acl(struct inode *inode, int type, void *buffer, size_t size)
+{
+       struct posix_acl *acl;
+       int error;
+
+       if (!reiserfs_posixacl(inode->i_sb))
+               return -EOPNOTSUPP;
+
+       acl = reiserfs_get_acl (inode, type);
+       if (IS_ERR(acl))
+               return PTR_ERR(acl);
+       if (acl == NULL)
+               return -ENODATA;
+       error = posix_acl_to_xattr(acl, buffer, size);
+       posix_acl_release(acl);
+
+       return error;
+}
+
+
+/*
+ * Convert from filesystem to in-memory representation.
+ */
+static struct posix_acl *
+posix_acl_from_disk(const void *value, size_t size)
+{
+       const char *end = (char *)value + size;
+       int n, count;
+       struct posix_acl *acl;
+
+       if (!value)
+               return NULL;
+       if (size < sizeof(reiserfs_acl_header))
+                return ERR_PTR(-EINVAL);
+       if (((reiserfs_acl_header *)value)->a_version !=
+           cpu_to_le32(REISERFS_ACL_VERSION))
+               return ERR_PTR(-EINVAL);
+       value = (char *)value + sizeof(reiserfs_acl_header);
+       count = reiserfs_acl_count(size);
+       if (count < 0)
+               return ERR_PTR(-EINVAL);
+       if (count == 0)
+               return NULL;
+       acl = posix_acl_alloc(count, GFP_NOFS);
+       if (!acl)
+               return ERR_PTR(-ENOMEM);
+       for (n=0; n < count; n++) {
+               reiserfs_acl_entry *entry =
+                       (reiserfs_acl_entry *)value;
+               if ((char *)value + sizeof(reiserfs_acl_entry_short) > end)
+                       goto fail;
+               acl->a_entries[n].e_tag  = le16_to_cpu(entry->e_tag);
+               acl->a_entries[n].e_perm = le16_to_cpu(entry->e_perm);
+               switch(acl->a_entries[n].e_tag) {
+                       case ACL_USER_OBJ:
+                       case ACL_GROUP_OBJ:
+                       case ACL_MASK:
+                       case ACL_OTHER:
+                               value = (char *)value +
+                                       sizeof(reiserfs_acl_entry_short);
+                               acl->a_entries[n].e_id = ACL_UNDEFINED_ID;
+                               break;
+
+                       case ACL_USER:
+                       case ACL_GROUP:
+                               value = (char *)value + sizeof(reiserfs_acl_entry);
+                               if ((char *)value > end)
+                                       goto fail;
+                               acl->a_entries[n].e_id =
+                                       le32_to_cpu(entry->e_id);
+                               break;
+
+                       default:
+                               goto fail;
+               }
+       }
+       if (value != end)
+               goto fail;
+       return acl;
+
+fail:
+       posix_acl_release(acl);
+       return ERR_PTR(-EINVAL);
+}
+
+/*
+ * Convert from in-memory to filesystem representation.
+ */
+static void *
+posix_acl_to_disk(const struct posix_acl *acl, size_t *size)
+{
+       reiserfs_acl_header *ext_acl;
+       char *e;
+       int n;
+
+       *size = reiserfs_acl_size(acl->a_count);
+       ext_acl = (reiserfs_acl_header *)kmalloc(sizeof(reiserfs_acl_header) +
+               acl->a_count * sizeof(reiserfs_acl_entry), GFP_NOFS);
+       if (!ext_acl)
+               return ERR_PTR(-ENOMEM);
+       ext_acl->a_version = cpu_to_le32(REISERFS_ACL_VERSION);
+       e = (char *)ext_acl + sizeof(reiserfs_acl_header);
+       for (n=0; n < acl->a_count; n++) {
+               reiserfs_acl_entry *entry = (reiserfs_acl_entry *)e;
+               entry->e_tag  = cpu_to_le16(acl->a_entries[n].e_tag);
+               entry->e_perm = cpu_to_le16(acl->a_entries[n].e_perm);
+               switch(acl->a_entries[n].e_tag) {
+                       case ACL_USER:
+                       case ACL_GROUP:
+                               entry->e_id =
+                                       cpu_to_le32(acl->a_entries[n].e_id);
+                               e += sizeof(reiserfs_acl_entry);
+                               break;
+
+                       case ACL_USER_OBJ:
+                       case ACL_GROUP_OBJ:
+                       case ACL_MASK:
+                       case ACL_OTHER:
+                               e += sizeof(reiserfs_acl_entry_short);
+                               break;
+
+                       default:
+                               goto fail;
+               }
+       }
+       return (char *)ext_acl;
+
+fail:
+       kfree(ext_acl);
+       return ERR_PTR(-EINVAL);
+}
+
+/*
+ * Inode operation get_posix_acl().
+ *
+ * inode->i_sem: down
+ * BKL held [before 2.5.x]
+ */
+struct posix_acl *
+reiserfs_get_acl(struct inode *inode, int type)
+{
+       char *name, *value;
+       struct posix_acl *acl, **p_acl;
+       size_t size;
+       int retval;
+
+        switch (type) {
+            case ACL_TYPE_ACCESS:
+                name = XATTR_NAME_ACL_ACCESS;
+                p_acl = &inode->u.reiserfs_i.i_acl_access;
+                break;
+            case ACL_TYPE_DEFAULT:
+                name = XATTR_NAME_ACL_DEFAULT;
+                p_acl = &inode->u.reiserfs_i.i_acl_default;
+                break;
+            default:
+                return ERR_PTR (-EINVAL);
+        }
+
+        if (IS_ERR (*p_acl)) {
+            if (PTR_ERR (*p_acl) == -ENODATA)
+                return NULL;
+        } else if (*p_acl != NULL)
+            return posix_acl_dup (*p_acl);
+
+        size = reiserfs_xattr_get (inode, name, NULL, 0);
+        if ((int)size < 0) {
+            if (size == -ENODATA || size == -ENOSYS) {
+               *p_acl = ERR_PTR (-ENODATA);
+               return NULL;
+            }
+            return ERR_PTR (size);
+        }
+
+        value = kmalloc (size, GFP_NOFS);
+        if (!value)
+            return ERR_PTR (-ENOMEM);
+
+       retval = reiserfs_xattr_get(inode, name, value, size);
+       if (retval == -ENODATA || retval == -ENOSYS) {
+               /* This shouldn't actually happen as it should have
+                  been caught above.. but just in case */
+               acl = NULL;
+               *p_acl = ERR_PTR (-ENODATA);
+        } else if (retval < 0) {
+               acl = ERR_PTR(retval);
+       } else {
+               acl = posix_acl_from_disk(value, retval);
+               *p_acl = posix_acl_dup (acl);
+        }
+
+       kfree(value);
+       return acl;
+}
+
+/*
+ * Inode operation set_posix_acl().
+ *
+ * inode->i_sem: down
+ * BKL held [before 2.5.x]
+ */
+int
+reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
+{
+        char *name;
+       void *value = NULL;
+       struct posix_acl **p_acl;
+       size_t size;
+       int error;
+
+       if (S_ISLNK(inode->i_mode))
+               return -EOPNOTSUPP;
+
+
+        switch (type) {
+            case ACL_TYPE_ACCESS:
+                name = XATTR_NAME_ACL_ACCESS;
+                p_acl = &inode->u.reiserfs_i.i_acl_access;
+                if (acl) {
+                    mode_t mode = inode->i_mode;
+                    error = posix_acl_equiv_mode (acl, &mode);
+                    if (error < 0)
+                        return error;
+                    else {
+                        inode->i_mode = mode;
+                        if (error == 0)
+                            acl = NULL;
+                    }
+                }
+                break;
+            case ACL_TYPE_DEFAULT:
+                name = XATTR_NAME_ACL_DEFAULT;
+                p_acl = &inode->u.reiserfs_i.i_acl_default;
+                if (!S_ISDIR (inode->i_mode))
+                    return acl ? -EACCES : 0;
+                break;
+            default:
+                return -EINVAL;
+        }
+
+       if (acl) {
+            value = posix_acl_to_disk(acl, &size);
+            if (IS_ERR(value))
+                return (int)PTR_ERR(value);
+            error = reiserfs_xattr_set(inode, name, value, size, 0);
+       } else {
+            error = reiserfs_xattr_del (inode, name);
+            if (error == -ENODATA)
+                error = 0;
+        }
+
+       if (value)
+               kfree(value);
+
+        if (!error) {
+            /* Release the old one */
+            if (!IS_ERR (*p_acl) && *p_acl)
+                posix_acl_release (*p_acl);
+
+            if (acl == NULL)
+                *p_acl = ERR_PTR (-ENODATA);
+            else 
+                *p_acl = posix_acl_dup (acl);
+        }
+
+       return error;
+}
+
+/* dir->i_sem: down,
+ * inode is new and not released into the wild yet */
+int
+reiserfs_inherit_default_acl (struct inode *dir, struct dentry *dentry, struct inode *inode)
+{
+    struct posix_acl *acl;
+    int err = 0;
+
+    /* ACLs only get applied to files and directories */
+    if (S_ISLNK (inode->i_mode))
+        return 0;
+
+    /* ACLs can only be used on "new" objects, so if it's an old object
+     * there is nothing to inherit from */
+    if (get_inode_sd_version (dir) == STAT_DATA_V1)
+        goto apply_umask;
+
+    /* Don't apply ACLs to objects in the .reiserfs_priv tree.. This
+     * would be useless since permissions are ignored, and a pain because
+     * it introduces locking cycles */
+    if (is_reiserfs_priv_object (dir)) {
+        inode->u.reiserfs_i.i_flags |= i_priv_object;
+        goto apply_umask;
+    }
+
+    acl = reiserfs_get_acl (dir, ACL_TYPE_DEFAULT);
+    if (IS_ERR (acl)) {
+        if (PTR_ERR (acl) == -ENODATA)
+            goto apply_umask;
+        return PTR_ERR (acl);
+    }
+
+    if (acl) {
+        struct posix_acl *acl_copy;
+        mode_t mode = inode->i_mode;
+        int need_acl;
+
+        /* Copy the default ACL to the default ACL of a new directory */
+        if (S_ISDIR (inode->i_mode)) {
+            err = reiserfs_set_acl (inode, ACL_TYPE_DEFAULT, acl);
+            if (err)
+                goto cleanup;
+        }
+
+        /* Now we reconcile the new ACL and the mode,
+           potentially modifying both */
+        acl_copy = posix_acl_clone (acl, GFP_NOFS);
+        if (!acl_copy) {
+            err = -ENOMEM;
+            goto cleanup;
+        }
+
+
+        need_acl = posix_acl_create_masq (acl_copy, &mode);
+        if (need_acl >= 0) {
+            if (mode != inode->i_mode) {
+                inode->i_mode = mode;
+            }
+
+            /* If we need an ACL.. */
+            if (need_acl > 0) {
+                err = reiserfs_set_acl (inode, ACL_TYPE_ACCESS, acl_copy);
+                if (err) 
+                    goto cleanup_copy;
+            }
+        }
+cleanup_copy:
+        posix_acl_release (acl_copy);
+cleanup:
+        posix_acl_release (acl);
+    } else {
+apply_umask:
+        /* no ACL, apply umask */
+        inode->i_mode &= ~current->fs->umask;
+    }
+
+    return err;
+}
+
+/* Looks up and caches the result of the default ACL.
+ * We do this so that we don't need to carry the xattr_sem into
+ * reiserfs_new_inode if we don't need to */
+int
+reiserfs_cache_default_acl (struct inode *inode)
+{
+    int ret = 0;
+    if (reiserfs_posixacl (inode->i_sb) &&
+        !is_reiserfs_priv_object (inode)) {
+        struct posix_acl *acl;
+        reiserfs_read_lock_xattrs (inode->i_sb);
+        acl = reiserfs_get_acl (inode, ACL_TYPE_DEFAULT);
+        reiserfs_read_unlock_xattrs (inode->i_sb);
+        ret = acl ? 1 : 0;
+        posix_acl_release (acl);
+    }
+
+    return ret;
+}
+
+static int
+__reiserfs_permission (struct inode *inode, int mask, int need_lock)
+{
+       int mode = inode->i_mode;
+
+       /* Nobody gets write access to a read-only fs */
+       if ((mask & MAY_WRITE) && IS_RDONLY(inode) &&
+           (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)))
+               return -EROFS;
+
+       /* Nobody gets write access to an immutable file */
+       if ((mask & MAY_WRITE) && IS_IMMUTABLE(inode))
+           return -EACCES;
+
+        /* We don't do permission checks on the internal objects.
+         * Permissions are determined by the "owning" object. */
+        if (is_reiserfs_priv_object (inode))
+            return 0;
+
+       if (current->fsuid == inode->i_uid) {
+               mode >>= 6;
+       } else if (reiserfs_posixacl(inode->i_sb) &&
+                   get_inode_sd_version (inode) != STAT_DATA_V1) {
+                struct posix_acl *acl;
+
+               /* ACL can't contain additional permissions if
+                  the ACL_MASK entry is 0 */
+               if (!(mode & S_IRWXG))
+                       goto check_groups;
+
+                if (need_lock)
+                    reiserfs_read_lock_xattrs (inode->i_sb);
+                acl = reiserfs_get_acl (inode, ACL_TYPE_ACCESS);
+                if (need_lock)
+                    reiserfs_read_unlock_xattrs (inode->i_sb);
+                if (IS_ERR (acl)) {
+                    if (PTR_ERR (acl) == -ENODATA)
+                        goto check_groups;
+                    return PTR_ERR (acl);
+                }
+
+                if (acl) {
+                    int err = posix_acl_permission (inode, acl, mask);
+                    posix_acl_release (acl);
+                    if (err == -EACCES) {
+                        goto check_capabilities;
+                    }
+                    return err;
+               } else {
+                       goto check_groups;
+                }
+
+       } else {
+check_groups:
+               if (in_group_p(inode->i_gid))
+                       mode >>= 3;
+       }
+       if ((mode & mask & S_IRWXO) == mask)
+               return 0;
+
+check_capabilities:
+       /* Allowed to override Discretionary Access Control? */
+        if ((mask & (MAY_READ|MAY_WRITE)) || (inode->i_mode & S_IXUGO))
+                if (capable(CAP_DAC_OVERRIDE))
+                        return 0;
+        /* Read and search granted if capable(CAP_DAC_READ_SEARCH) */
+        if (capable(CAP_DAC_READ_SEARCH) && ((mask == MAY_READ) ||
+            (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE))))
+                return 0;
+       return -EACCES;
+}
+
+int
+reiserfs_permission (struct inode *inode, int mask)
+{
+    return __reiserfs_permission (inode, mask, 1);
+}
+
+int
+reiserfs_permission_locked (struct inode *inode, int mask)
+{
+    return __reiserfs_permission (inode, mask, 0);
+}
+
+int
+reiserfs_acl_chmod (struct inode *inode)
+{
+        struct posix_acl *acl, *clone;
+        int error;
+
+        if (S_ISLNK(inode->i_mode))
+                return -EOPNOTSUPP;
+
+       if (get_inode_sd_version (inode) == STAT_DATA_V1 ||
+           !reiserfs_posixacl(inode->i_sb))
+        {
+           return 0;
+       }
+
+        reiserfs_read_lock_xattrs (inode->i_sb);
+        acl = reiserfs_get_acl(inode, ACL_TYPE_ACCESS);
+        reiserfs_read_unlock_xattrs (inode->i_sb);
+        if (!acl)
+                return 0;
+        if (IS_ERR(acl))
+                return PTR_ERR(acl);
+        clone = posix_acl_clone(acl, GFP_NOFS);
+        posix_acl_release(acl);
+        if (!clone)
+                return -ENOMEM;
+        error = posix_acl_chmod_masq(clone, inode->i_mode);
+        if (!error) {
+                reiserfs_write_lock_xattrs (inode->i_sb);
+                error = reiserfs_set_acl(inode, ACL_TYPE_ACCESS, clone);
+                reiserfs_write_unlock_xattrs (inode->i_sb);
+        }
+        posix_acl_release(clone);
+        return error;
+}
+
+static int
+posix_acl_access_get(struct inode *inode, const char *name,
+                         void *buffer, size_t size)
+{
+       if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1)
+               return -EINVAL;
+       return xattr_get_acl(inode, ACL_TYPE_ACCESS, buffer, size);
+}
+
+static int
+posix_acl_access_set(struct inode *inode, const char *name,
+                         const void *value, size_t size, int flags)
+{
+       if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1)
+               return -EINVAL;
+       return xattr_set_acl(inode, ACL_TYPE_ACCESS, value, size);
+}
+
+static int
+posix_acl_access_del (struct inode *inode, const char *name)
+{
+    struct posix_acl **acl = &inode->u.reiserfs_i.i_acl_access;
+    if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1)
+       return -EINVAL;
+    if (!IS_ERR (*acl) && *acl) {
+        posix_acl_release (*acl);
+        *acl = ERR_PTR (-ENODATA);
+    }
+
+    return 0;
+}
+
+static int
+posix_acl_access_list (struct inode *inode, const char *name, int namelen, char *out)
+{
+    int len = namelen;
+    if (!reiserfs_posixacl (inode->i_sb))
+        return 0;
+    if (out)
+        memcpy (out, name, len);
+
+    return len;
+}
+
+struct reiserfs_xattr_handler posix_acl_access_handler = {
+    prefix: XATTR_NAME_ACL_ACCESS,
+    get: posix_acl_access_get,
+    set: posix_acl_access_set,
+    del: posix_acl_access_del,
+    list: posix_acl_access_list,
+};
+
+static int
+posix_acl_default_get (struct inode *inode, const char *name,
+                          void *buffer, size_t size)
+{
+       if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1)
+               return -EINVAL;
+       return xattr_get_acl(inode, ACL_TYPE_DEFAULT, buffer, size);
+}
+
+static int
+posix_acl_default_set(struct inode *inode, const char *name,
+                          const void *value, size_t size, int flags)
+{
+       if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1)
+               return -EINVAL;
+       return xattr_set_acl(inode, ACL_TYPE_DEFAULT, value, size);
+}
+
+static int
+posix_acl_default_del (struct inode *inode, const char *name)
+{
+    struct posix_acl **acl = &inode->u.reiserfs_i.i_acl_default;
+    if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1)
+       return -EINVAL;
+    if (!IS_ERR (*acl) && *acl) {
+        posix_acl_release (*acl);
+        *acl = ERR_PTR (-ENODATA);
+    }
+
+    return 0;
+}
+
+static int
+posix_acl_default_list (struct inode *inode, const char *name, int namelen, char *out)
+{
+    int len = namelen;
+    if (!reiserfs_posixacl (inode->i_sb))
+        return 0;
+    if (out)
+        memcpy (out, name, len);
+
+    return len;
+}
+
+struct reiserfs_xattr_handler posix_acl_default_handler = {
+    prefix: XATTR_NAME_ACL_DEFAULT,
+    get: posix_acl_default_get,
+    set: posix_acl_default_set,
+    del: posix_acl_default_del,
+    list: posix_acl_default_list,
+};
+
+int __init
+reiserfs_xattr_posix_acl_init (void)
+{
+    int err;
+    err = reiserfs_xattr_register_handler (&posix_acl_access_handler);
+    if (!err)
+        err = reiserfs_xattr_register_handler (&posix_acl_default_handler);
+    return err;
+}
+
+int
+reiserfs_xattr_posix_acl_exit (void)
+{
+    int err;
+    err = reiserfs_xattr_unregister_handler (&posix_acl_access_handler);
+    if (!err)
+        err = reiserfs_xattr_unregister_handler (&posix_acl_default_handler);
+    return err;
+}
diff -urN linux-2.4.22/fs/reiserfs/xattr_trusted.c linux-2.4.22-aclea/fs/reiserfs/xattr_trusted.c
--- linux-2.4.22/fs/reiserfs/xattr_trusted.c    1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-aclea/fs/reiserfs/xattr_trusted.c      2003-09-12 17:19:43.000000000 +0200
@@ -0,0 +1,97 @@
+#include <linux/reiserfs_fs.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/pagemap.h>
+#include <linux/xattr.h>
+#include <linux/reiserfs_xattr.h>
+#include <asm/uaccess.h>
+
+#ifdef CONFIG_REISERFS_FS_POSIX_ACL
+# include <linux/reiserfs_acl.h>
+#endif
+
+#define XATTR_TRUSTED_PREFIX "trusted."
+
+static int
+trusted_get (struct inode *inode, const char *name, void *buffer, size_t size)
+{
+    if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
+        return -EINVAL;
+
+    if (!reiserfs_xattrs_trusted (inode->i_sb))
+        return -EOPNOTSUPP;
+
+    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+        return -EPERM;
+
+    return reiserfs_xattr_get (inode, name, buffer, size);
+}
+
+static int
+trusted_set (struct inode *inode, const char *name, const void *buffer,
+          size_t size, int flags)
+{
+    if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
+        return -EINVAL;
+
+    if (!reiserfs_xattrs_trusted (inode->i_sb))
+        return -EOPNOTSUPP;
+
+    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+        return -EPERM;
+
+    return reiserfs_xattr_set (inode, name, buffer, size, flags);
+}
+
+static int
+trusted_del (struct inode *inode, const char *name)
+{
+    if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
+        return -EINVAL;
+
+    if (!reiserfs_xattrs_trusted (inode->i_sb))
+        return -EOPNOTSUPP;
+
+    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+        return -EPERM;
+
+    return 0;
+}
+
+static int
+trusted_list (struct inode *inode, const char *name, int namelen, char *out)
+{
+    int len = namelen;
+
+    if (!reiserfs_xattrs_trusted (inode->i_sb))
+        return 0;
+
+    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+        return 0;
+
+    if (out)
+        memcpy (out, name, len);
+
+    return len;
+}
+
+
+struct reiserfs_xattr_handler trusted_handler = {
+    prefix: XATTR_TRUSTED_PREFIX,
+    get: trusted_get,
+    set: trusted_set,
+    del: trusted_del,
+    list: trusted_list,
+};
+
+int __init
+reiserfs_xattr_trusted_init (void)
+{
+    return reiserfs_xattr_register_handler (&trusted_handler);
+}
+
+int
+reiserfs_xattr_trusted_exit (void)
+{
+    return reiserfs_xattr_unregister_handler (&trusted_handler);
+}
diff -urN linux-2.4.22/fs/reiserfs/xattr_user.c linux-2.4.22-aclea/fs/reiserfs/xattr_user.c
--- linux-2.4.22/fs/reiserfs/xattr_user.c       1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-aclea/fs/reiserfs/xattr_user.c 2003-09-12 17:19:37.000000000 +0200
@@ -0,0 +1,112 @@
+#include <linux/reiserfs_fs.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/pagemap.h>
+#include <linux/xattr.h>
+#include <linux/reiserfs_xattr.h>
+#include <asm/uaccess.h>
+
+#ifdef CONFIG_REISERFS_FS_POSIX_ACL
+# include <linux/reiserfs_acl.h>
+#endif
+
+#define XATTR_USER_PREFIX "user."
+
+static int
+user_get (struct inode *inode, const char *name, void *buffer, size_t size)
+{
+
+    int error;
+
+    if (strlen(name) < sizeof(XATTR_USER_PREFIX))
+        return -EINVAL;
+
+    if (!reiserfs_xattrs_user (inode->i_sb))
+        return -EOPNOTSUPP;
+
+    error = reiserfs_permission_locked (inode, MAY_READ);
+    if (error)
+        return error;
+
+    return reiserfs_xattr_get (inode, name, buffer, size);
+}
+
+static int
+user_set (struct inode *inode, const char *name, const void *buffer,
+          size_t size, int flags)
+{
+
+    int error;
+
+    if (strlen(name) < sizeof(XATTR_USER_PREFIX))
+        return -EINVAL;
+
+    if (!reiserfs_xattrs_user (inode->i_sb))
+        return -EOPNOTSUPP;
+
+    if (!S_ISREG (inode->i_mode) &&
+        (!S_ISDIR (inode->i_mode) || inode->i_mode & S_ISVTX))
+        return -EPERM;
+
+    error = reiserfs_permission_locked (inode, MAY_WRITE);
+    if (error)
+        return error;
+
+    return reiserfs_xattr_set (inode, name, buffer, size, flags);
+}
+
+static int
+user_del (struct inode *inode, const char *name)
+{
+    int error;
+
+    if (strlen(name) < sizeof(XATTR_USER_PREFIX))
+        return -EINVAL;
+
+    if (!reiserfs_xattrs_user (inode->i_sb))
+        return -EOPNOTSUPP;
+
+    if (!S_ISREG (inode->i_mode) &&
+        (!S_ISDIR (inode->i_mode) || inode->i_mode & S_ISVTX))
+        return -EPERM;
+
+    error = reiserfs_permission_locked (inode, MAY_WRITE);
+    if (error)
+        return error;
+
+    return 0;
+}
+
+static int
+user_list (struct inode *inode, const char *name, int namelen, char *out)
+{
+    int len = namelen;
+    if (!reiserfs_xattrs_user (inode->i_sb))
+        return 0;
+
+    if (out)
+        memcpy (out, name, len);
+
+    return len;
+}
+
+
+struct reiserfs_xattr_handler user_handler = {
+    prefix: XATTR_USER_PREFIX,
+    get: user_get,
+    set: user_set,
+    del: user_del,
+    list: user_list,
+};
+
+int __init
+reiserfs_xattr_user_init (void)
+{
+    return reiserfs_xattr_register_handler (&user_handler);
+}
+
+int
+reiserfs_xattr_user_exit (void)
+{
+    return reiserfs_xattr_unregister_handler (&user_handler);
+}
diff -urN linux-2.4.22/include/linux/reiserfs_acl.h linux-2.4.22-aclea/include/linux/reiserfs_acl.h
--- linux-2.4.22/include/linux/reiserfs_acl.h   1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-aclea/include/linux/reiserfs_acl.h     2003-09-12 17:19:37.000000000 +0200
@@ -0,0 +1,92 @@
+#include <linux/init.h>
+#include <linux/posix_acl.h>
+#include <linux/xattr_acl.h>
+
+#define REISERFS_ACL_VERSION   0x0001
+
+typedef struct {
+       __u16           e_tag;
+       __u16           e_perm;
+       __u32           e_id;
+} reiserfs_acl_entry;
+
+typedef struct {
+       __u16           e_tag;
+       __u16           e_perm;
+} reiserfs_acl_entry_short;
+
+typedef struct {
+       __u32           a_version;
+} reiserfs_acl_header;
+
+static inline size_t reiserfs_acl_size(int count)
+{
+       if (count <= 4) {
+               return sizeof(reiserfs_acl_header) +
+                      count * sizeof(reiserfs_acl_entry_short);
+       } else {
+               return sizeof(reiserfs_acl_header) +
+                      4 * sizeof(reiserfs_acl_entry_short) +
+                      (count - 4) * sizeof(reiserfs_acl_entry);
+       }
+}
+
+static inline int reiserfs_acl_count(size_t size)
+{
+       ssize_t s;
+       size -= sizeof(reiserfs_acl_header);
+       s = size - 4 * sizeof(reiserfs_acl_entry_short);
+       if (s < 0) {
+               if (size % sizeof(reiserfs_acl_entry_short))
+                       return -1;
+               return size / sizeof(reiserfs_acl_entry_short);
+       } else {
+               if (s % sizeof(reiserfs_acl_entry))
+                       return -1;
+               return s / sizeof(reiserfs_acl_entry) + 4;
+       }
+}
+
+
+#ifdef CONFIG_REISERFS_FS_POSIX_ACL
+struct posix_acl * reiserfs_get_acl(struct inode *inode, int type);
+int reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl);
+int reiserfs_permission (struct inode *inode, int mask);
+int reiserfs_permission_locked (struct inode *inode, int mask);
+int reiserfs_acl_chmod (struct inode *inode);
+int reiserfs_inherit_default_acl (struct inode *dir, struct dentry *dentry, struct inode *inode);
+int reiserfs_cache_default_acl (struct inode *dir);
+extern int reiserfs_xattr_posix_acl_init (void) __init;
+extern int reiserfs_xattr_posix_acl_exit (void);
+#else
+
+#define reiserfs_permission NULL
+#define reiserfs_set_acl NULL
+#define reiserfs_get_acl NULL
+#define reiserfs_cache_default_acl(inode) 0
+
+static inline int
+reiserfs_xattr_posix_acl_init (void)
+{
+    return 0;
+}
+
+static inline int
+reiserfs_xattr_posix_acl_exit (void)
+{
+    return 0;
+}
+
+static inline int
+reiserfs_acl_chmod (struct inode *inode)
+{
+    return 0;
+}
+
+static inline int
+reiserfs_inherit_default_acl (const struct inode *dir, struct dentry *dentry, struct inode *inode)
+{
+    return 0;
+}
+
+#endif
diff -urN linux-2.4.22/include/linux/reiserfs_fs.h linux-2.4.22-aclea/include/linux/reiserfs_fs.h
--- linux-2.4.22/include/linux/reiserfs_fs.h    2003-08-25 13:44:44.000000000 +0200
+++ linux-2.4.22-aclea/include/linux/reiserfs_fs.h      2003-09-12 17:19:29.000000000 +0200
@@ -1900,6 +1900,7 @@
 
 void sd_attrs_to_i_attrs( __u16 sd_attrs, struct inode *inode );
 void i_attrs_to_sd_attrs( struct inode *inode, __u16 *sd_attrs );
+int reiserfs_setattr(struct dentry *dentry, struct iattr *attr);
 
 /* namei.c */
 inline void set_de_name_and_namelen (struct reiserfs_dir_entry * de);
@@ -1969,6 +1970,7 @@
 
 /* dir.c */
 extern struct inode_operations reiserfs_dir_inode_operations;
+extern struct inode_operations reiserfs_symlink_inode_operations;
 extern struct file_operations reiserfs_dir_operations;
 
 /* tail_conversion.c */
@@ -2189,6 +2191,9 @@
 #define REISERFS_IOC_GETVERSION        EXT2_IOC_GETVERSION
 #define REISERFS_IOC_SETVERSION         EXT2_IOC_SETVERSION
                                 
+/* xattr stuff */
+#define REISERFS_XATTR_DIR_SEM(s) ((s)->u.reiserfs_sb.xattr_dir_sem)
+
 #endif /* _LINUX_REISER_FS_H */
 
 
diff -urN linux-2.4.22/include/linux/reiserfs_fs_i.h linux-2.4.22-aclea/include/linux/reiserfs_fs_i.h
--- linux-2.4.22/include/linux/reiserfs_fs_i.h  2003-06-13 16:51:39.000000000 +0200
+++ linux-2.4.22-aclea/include/linux/reiserfs_fs_i.h    2003-09-12 17:19:37.000000000 +0200
@@ -23,7 +23,8 @@
        truncate or unlink. Safe link is used to avoid leakage of disk
        space on crash with some files open, but unlinked. */
     i_link_saved_unlink_mask   =  0x0010,
-    i_link_saved_truncate_mask =  0x0020
+    i_link_saved_truncate_mask =  0x0020,
+    i_priv_object              =  0x0080,
 } reiserfs_inode_flags;
 
 
@@ -60,6 +61,9 @@
      */
     unsigned long i_tail_trans_id;
     unsigned long i_tail_trans_index;
+
+    struct posix_acl *i_acl_access;
+    struct posix_acl *i_acl_default;
 };
 
 #endif
diff -urN linux-2.4.22/include/linux/reiserfs_fs_sb.h linux-2.4.22-aclea/include/linux/reiserfs_fs_sb.h
--- linux-2.4.22/include/linux/reiserfs_fs_sb.h 2003-08-25 13:44:44.000000000 +0200
+++ linux-2.4.22-aclea/include/linux/reiserfs_fs_sb.h   2003-09-12 17:19:43.000000000 +0200
@@ -6,6 +6,7 @@
 
 #ifdef __KERNEL__
 #include <linux/tqueue.h>
+#include <linux/rwsem.h>
 #endif
 
 //
@@ -171,13 +172,17 @@
 ** transaction handle which is passed around for all journal calls
 */
 struct reiserfs_transaction_handle {
-                               /* ifdef it. -Hans */
-  char *t_caller ;              /* debugging use */
+  struct super_block *t_super ; /* super for this FS when journal_begin was 
+                                  called. saves calls to reiserfs_get_super 
+                                  also used by nested transactions to make
+                                  sure they are nesting on the right FS
+                                  _must_ be first in the handle 
+                               */
+  int t_refcount;
   int t_blocks_logged ;         /* number of blocks this writer has logged */
   int t_blocks_allocated ;      /* number of blocks this writer allocated */
   unsigned long t_trans_id ;    /* sanity check, equals the current trans id */
-  struct super_block *t_super ; /* super for this FS when journal_begin was 
-                                   called. saves calls to reiserfs_get_super */
+  void *t_handle_save ;                /* save existing current->journal_info */
   int displace_new_blocks:1;   /* if new block allocation occurres, that block
                                   should be displaced from others */
 } ;
@@ -413,6 +418,9 @@
     reiserfs_proc_info_data_t s_proc_info_data;
     struct proc_dir_entry *procdir;
     int reserved_blocks; /* amount of blocks reserved for further allocations */
+    struct dentry *priv_root; /* root of /.reiserfs_priv */
+    struct dentry *xattr_root; /* root of /.reiserfs_priv/.xa */
+    struct rw_semaphore xattr_dir_sem;
 };
 
 /* Definitions of reiserfs on-disk properties: */
@@ -459,6 +467,12 @@
 #define REISERFS_TEST4 14 
 
 #define REISERFS_ATTRS (15)
+#define REISERFS_XATTRS 16
+#define REISERFS_XATTRS_USER 17
+#define REISERFS_NO_XATTRS_USER 18
+#define REISERFS_POSIXACL 17
+#define REISERFS_NO_POSIXACL 18
+
 
 #define reiserfs_r5_hash(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << FORCE_R5_HASH))
 #define reiserfs_rupasov_hash(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << FORCE_RUPASOV_HASH))
@@ -476,6 +490,17 @@
 #define reiserfs_attrs(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << REISERFS_ATTRS))
 #define old_format_only(s) ((s)->u.reiserfs_sb.s_properties & (1 << REISERFS_3_5))
 #define convert_reiserfs(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << REISERFS_CONVERT))
+#define reiserfs_xattrs_user(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << REISERFS_XATTRS_USER))
+#define reiserfs_xattrs_optional(s) (reiserfs_xattrs_user(s) || reiserfs_posixacl(s))
+#define reiserfs_posixacl(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << REISERFS_POSIXACL))
+#ifndef CONFIG_REISERFS_FS_XATTR_TRUSTED
+#define reiserfs_xattrs(s) ((s)->u.reiserfs_sb.s_mount_opt & (1 << REISERFS_XATTRS))
+# define reiserfs_xattrs_trusted(s) (0)
+#else
+/* If trusted xattrs are compiled in, they're "always on." */
+# define reiserfs_xattrs(s) (1)
+# define reiserfs_xattrs_trusted(s) (1)
+#endif
 
 
 void reiserfs_file_buffer (struct buffer_head * bh, int list);
diff -urN linux-2.4.22/include/linux/reiserfs_xattr.h linux-2.4.22-aclea/include/linux/reiserfs_xattr.h
--- linux-2.4.22/include/linux/reiserfs_xattr.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.22-aclea/include/linux/reiserfs_xattr.h   2003-09-12 17:19:43.000000000 +0200
@@ -0,0 +1,132 @@
+/*
+  File: linux/reiserfs_xattr.h
+*/
+
+#include <linux/config.h>
+#include <linux/init.h>
+#include <linux/xattr.h>
+
+/* Magic value in header */
+#define REISERFS_XATTR_MAGIC 0x52465841 /* "RFXA" */
+
+struct reiserfs_xattr_header {
+    __u32 h_magic;              /* magic number for identification */
+    __u32 h_hash;               /* hash of the value */
+};
+
+#ifdef __KERNEL__
+
+struct reiserfs_xattr_handler {
+       char *prefix;
+       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);
+       int (*del)(struct inode *inode, const char *name);
+        int (*list)(struct inode *inode, const char *name, int namelen, char *out);
+        struct reiserfs_xattr_handler *next;
+};
+
+
+#ifdef CONFIG_REISERFS_FS_XATTR
+#define is_reiserfs_priv_object(inode) (((inode)->u.reiserfs_i.i_flags & i_priv_object) == i_priv_object)
+ssize_t reiserfs_getxattr (struct dentry *dentry, const char *name,
+                          void *buffer, size_t size);
+int reiserfs_setxattr (struct dentry *dentry, const char *name,
+                       const void *value, size_t size, int flags);
+ssize_t reiserfs_listxattr (struct dentry *dentry, char *buffer, size_t size);
+int reiserfs_removexattr (struct dentry *dentry, const char *name);
+int reiserfs_delete_xattrs (struct inode *inode);
+int reiserfs_chown_xattrs (struct inode *inode, struct iattr *attrs);
+int reiserfs_xattr_init (struct super_block *sb, int mount_flags);
+
+static inline void
+reiserfs_write_lock_xattrs(struct super_block *sb)
+{
+    down_write (&REISERFS_XATTR_DIR_SEM(sb));
+}
+static inline void
+reiserfs_write_unlock_xattrs(struct super_block *sb)
+{
+    up_write (&REISERFS_XATTR_DIR_SEM(sb));
+}
+static inline void
+reiserfs_read_lock_xattrs(struct super_block *sb)
+{
+    down_read (&REISERFS_XATTR_DIR_SEM(sb));
+}
+static inline void
+reiserfs_read_unlock_xattrs(struct super_block *sb)
+{
+    up_read (&REISERFS_XATTR_DIR_SEM(sb));
+}
+#else
+#define is_reiserfs_priv_object(inode) 0
+#define reiserfs_getxattr NULL
+#define reiserfs_setxattr NULL
+#define reiserfs_listxattr NULL
+#define reiserfs_removexattr NULL
+#define reiserfs_write_lock_xattrs(sb)
+#define reiserfs_write_unlock_xattrs(sb)
+#define reiserfs_read_lock_xattrs(sb)
+#define reiserfs_read_unlock_xattrs(sb)
+static inline int
+reiserfs_xattr_init (struct super_block *s, int mount_flags)
+{
+    s->s_flags = (s->s_flags & ~MS_POSIXACL); /* to be sure */
+    return 0;
+}
+
+static inline int
+reiserfs_delete_xattrs (struct inode *inode)
+{
+    return 0;
+}
+
+static inline int
+reiserfs_chown_xattrs (struct inode *inode, struct iattr *attrs)
+{
+    return 0;
+}
+#endif
+
+extern int reiserfs_xattr_register_handler(struct reiserfs_xattr_handler *);
+extern int reiserfs_xattr_unregister_handler(struct reiserfs_xattr_handler *);
+extern int reiserfs_xattr_del (struct inode *, const char *);
+extern int reiserfs_xattr_get (const struct inode *, const char *, void *, size_t);
+extern int reiserfs_xattr_set (struct inode *, const char *, const void *,
+                               size_t, int);
+#ifdef CONFIG_REISERFS_FS_XATTR_USER
+extern int reiserfs_xattr_user_init (void) __init;
+extern int reiserfs_xattr_user_exit (void);
+#else
+static inline int
+reiserfs_xattr_user_init (void)
+{
+    return 0;
+}
+
+static inline int
+reiserfs_xattr_user_exit (void)
+{
+    return 0;
+}
+#endif
+#ifdef CONFIG_REISERFS_FS_XATTR_TRUSTED
+extern int reiserfs_xattr_trusted_init (void) __init;
+extern int reiserfs_xattr_trusted_exit (void);
+#else
+static inline int
+reiserfs_xattr_trusted_init (void)
+{
+    return 0;
+}
+
+static inline int
+reiserfs_xattr_trusted_exit (void)
+{
+    return 0;
+}
+#endif
+
+#endif  /* __KERNEL__ */