X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fext2%2Facl.c;h=ae8c4f850b27d0e83e28e684a07637a992abbe69;hb=6d4762678b7cbe932e858c62c07c533e1736a8bf;hp=7c420b800c3438fd02ab669368f48fb9a6f01c5a;hpb=f52720ca5f48574e347dff35ffe6b389ace61537;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c
index 7c420b8..ae8c4f8 100644
--- a/fs/ext2/acl.c
+++ b/fs/ext2/acl.c
@@ -294,7 +294,7 @@ ext2_check_acl(struct inode *inode, int mask)
 }
 
 int
-ext2_permission(struct inode *inode, int mask, struct nameidata *nd)
+ext2_permission(struct inode *inode, int mask)
 {
 	return generic_permission(inode, mask, ext2_check_acl);
 }
@@ -464,7 +464,7 @@ ext2_xattr_set_acl(struct inode *inode, int type, const void *value,
 
 	if (!test_opt(inode->i_sb, POSIX_ACL))
 		return -EOPNOTSUPP;
-	if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+	if (!is_owner_or_cap(inode))
 		return -EPERM;
 
 	if (value) {