- added description of djurban's branch

[packages/kernel.git] / linux-2.4.22-intermezzo-acl.patch

--- linux-2.4.22-smp/fs/intermezzo/vfs.c.orig	Sat Sep 20 21:58:59 2003
+++ linux-2.4.22-smp/fs/intermezzo/vfs.c	Sat Sep 20 22:01:42 2003
@@ -467,7 +467,7 @@ int lento_setattr(const char *name, stru
         struct presto_file_set *fset;
         int error;
-#ifdef  CONFIG_FS_POSIX_ACL
+#if  0
         int (*set_posix_acl)(struct inode *, int type, posix_acl_t *)=NULL;
 #endif
 
         ENTRY;
@@ -507,7 +507,7 @@
                                  (dentry->d_inode->i_mode & ~S_IALLUGO);
                 CDEBUG(D_PIOCTL, "chmod: orig %#o, set %#o, result %#o\n",
                        dentry->d_inode->i_mode, set_mode, iattr->ia_mode);
-#ifdef CONFIG_FS_POSIX_ACL
+#if 0
                 /* ACl code interacts badly with setattr 
                  * since it tries to modify the ACL using 
                  * set_ext_attr which recurses back into presto.  
@@ -535,7 +535,7 @@
                 }
         }
 
-#ifdef CONFIG_FS_POSIX_ACL
+#if 0
         /* restore the inode_operations if we changed them*/
         if (iattr->ia_valid & ATTR_MODE) 
                 dentry->d_inode->i_op->set_posix_acl=set_posix_acl;