X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fgeneric_acl.c;h=995d63b2e747556c879c52be194375196995b58a;hb=be55caf177e14bc54d1498d599a78849b0b230bb;hp=9ccb789471713dc94a6768c4cd459bf973166ee3;hpb=f0c8bd164e1a0585d7e46896553136b4f488bd19;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index 9ccb789..995d63b 100644
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -78,7 +78,7 @@ generic_acl_set(struct inode *inode, struct generic_acl_operations *ops,
 
 	if (S_ISLNK(inode->i_mode))
 		return -EOPNOTSUPP;
-	if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
+	if (!is_owner_or_cap(inode))
 		return -EPERM;
 	if (value) {
 		acl = posix_acl_from_xattr(value, size);