diff -u -r linux/fs/ext2/acl.c linux-perm/fs/ext2/acl.c --- linux/fs/ext2/acl.c Wed May 6 19:56:08 1998 +++ linux-perm/fs/ext2/acl.c Wed Jul 12 22:03:27 2000 @@ -54,7 +54,7 @@ if (((mode & mask & S_IRWXO) == mask) || capable(CAP_DAC_OVERRIDE)) return 0; if ((mask == S_IROTH) || - (S_ISDIR(mode) && !(mask & ~(S_IROTH | S_IXOTH)))) + (S_ISDIR(inode->i_mode) && !(mask & ~(S_IROTH | S_IXOTH)))) if (capable(CAP_DAC_READ_SEARCH)) return 0; return -EACCES; diff -u -r linux/fs/namei.c linux-perm/fs/namei.c --- linux/fs/namei.c Tue Jan 4 19:12:23 2000 +++ linux-perm/fs/namei.c Wed Jul 12 22:02:41 2000 @@ -155,7 +155,7 @@ return 0; /* read and search access */ if ((mask == S_IROTH) || - (S_ISDIR(mode) && !(mask & ~(S_IROTH | S_IXOTH)))) + (S_ISDIR(inode->i_mode) && !(mask & ~(S_IROTH | S_IXOTH)))) if (capable(CAP_DAC_READ_SEARCH)) return 0; return -EACCES; diff -u -r linux/fs/proc/inode.c linux-perm/fs/proc/inode.c --- linux/fs/proc/inode.c Sat May 9 03:10:30 1998 +++ linux-perm/fs/proc/inode.c Wed Jul 12 22:03:36 2000 @@ -149,7 +149,7 @@ return 0; /* read and search access */ if ((mask == S_IROTH) || - (S_ISDIR(mode) && !(mask & ~(S_IROTH | S_IXOTH)))) + (S_ISDIR(inode->i_mode) && !(mask & ~(S_IROTH | S_IXOTH)))) if (capable(CAP_DAC_READ_SEARCH)) return 0; return -EACCES; diff -u -r linux/fs/ufs/acl.c linux-perm/fs/ufs/acl.c --- linux/fs/ufs/acl.c Mon Jan 4 20:51:29 1999 +++ linux-perm/fs/ufs/acl.c Wed Jul 12 22:03:01 2000 @@ -61,7 +61,7 @@ if (((mode & mask & S_IRWXO) == mask) || capable(CAP_DAC_OVERRIDE)) return 0; if ((mask == S_IROTH) || - (S_ISDIR(mode) && !(mask & ~(S_IROTH | S_IXOTH)))) + (S_ISDIR(inode->i_mode) && !(mask & ~(S_IROTH | S_IXOTH)))) if (capable(CAP_DAC_READ_SEARCH)) return 0; return -EACCES;