X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fgfs2%2Facl.c;h=1047a8c7226afb56c8a13c5493c2ac66de741cbb;hb=13f14b4d8be225cbb11ff2be7c048590a9ccf87b;hp=6e80844367ee9b5edd81143bc659ab14834809a5;hpb=cece901481bafbf14de8cbd3a89ae869ea881055;p=linux-2.6

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 6e80844367..1047a8c722 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -74,7 +74,7 @@ int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access)
 {
 	if (!GFS2_SB(&ip->i_inode)->sd_args.ar_posix_acl)
 		return -EOPNOTSUPP;
-	if (current->fsuid != ip->i_inode.i_uid && !capable(CAP_FOWNER))
+	if (!is_owner_or_cap(&ip->i_inode))
 		return -EPERM;
 	if (S_ISLNK(ip->i_inode.i_mode))
 		return -EOPNOTSUPP;