X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fxattr.c;h=a44fd92caca31c72aba82e61ec6b321d7ebf5a7d;hb=dc79747019b43c28d1f50aad69b8039f8d8db301;hp=4523aca79659c24f5d2ca3b8ee415ddd9588b73f;hpb=0c4ea957c6ec953d84cc07346437abe0ae4bb57d;p=~andy%2Flinux

diff --git a/fs/xattr.c b/fs/xattr.c
index 4523aca7965..a44fd92caca 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -60,8 +60,7 @@ xattr_permission(struct inode *inode, const char *name, int mask)
 		if (!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode))
 			return -EPERM;
 		if (S_ISDIR(inode->i_mode) && (inode->i_mode & S_ISVTX) &&
-		    (mask & MAY_WRITE) && (current->fsuid != inode->i_uid) &&
-		    !capable(CAP_FOWNER))
+		    (mask & MAY_WRITE) && !is_owner_or_cap(inode))
 			return -EPERM;
 	}