1 diff -urN linux-2.4.24.org/fs/intermezzo/vfs.c linux-2.4.24/fs/intermezzo/vfs.c
2 --- linux-2.4.24.org/fs/intermezzo/vfs.c 2004-01-18 16:55:22.382895163 +0100
3 +++ linux-2.4.24/fs/intermezzo/vfs.c 2004-01-18 16:56:21.407533002 +0100
5 #ifdef CONFIG_FS_EXT_ATTR
6 # include <linux/ext_attr.h>
8 -#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
9 +#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL && 0
10 # include <linux/posix_acl.h>
14 struct dentry *dentry;
15 struct presto_file_set *fset;
17 -#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
18 +#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL && 0
19 int (*set_posix_acl)(struct inode *, int type, posix_acl_t *)=NULL;
23 (dentry->d_inode->i_mode & ~S_IALLUGO);
24 CDEBUG(D_PIOCTL, "chmod: orig %#o, set %#o, result %#o\n",
25 dentry->d_inode->i_mode, set_mode, iattr->ia_mode);
26 -#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
27 +#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL && 0
28 /* ACl code interacts badly with setattr
29 * since it tries to modify the ACL using
30 * set_ext_attr which recurses back into presto.
35 -#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
36 +#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL && 0
37 /* restore the inode_operations if we changed them*/
38 if (iattr->ia_valid & ATTR_MODE)
39 dentry->d_inode->i_op->set_posix_acl=set_posix_acl;
42 #ifdef CONFIG_FS_EXT_ATTR
44 -#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
45 +#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL && 0
46 /* Posix ACL code changes i_mode without using a notify_change (or
47 * a mark_inode_dirty!). We need to duplicate this at the reintegrator
48 * which is done by this function. This function also takes care of
53 -#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL
54 +#ifdef CONFIG_INTERMEZZO_FS_POSIX_ACL && 0
55 /* Reset mode if specified*/
56 /* XXX: when we do native acl support, move this code out! */