X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fattr.c;h=f8dfc2269d85634aa61ebb19a761e986ea0bbc93;hb=2f66b529d9d131971e2509aee5478c61ca258ece;hp=a0a0c7b07ba3908379d311931254cc5ba9b2d014;hpb=9b6a51746ffe8d619f1097675d2dc5e303470024;p=powerpc.git

diff --git a/fs/attr.c b/fs/attr.c
index a0a0c7b07b..f8dfc2269d 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -42,7 +42,7 @@ int inode_change_ok(struct inode *inode, struct iattr *attr)
 
 	/* Make sure a caller can chmod. */
 	if (ia_valid & ATTR_MODE) {
-		if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+		if (!is_owner_or_cap(inode))
 			goto error;
 		/* Also check the setgid bit! */
 		if (!in_group_p((ia_valid & ATTR_GID) ? attr->ia_gid :
@@ -52,7 +52,7 @@ int inode_change_ok(struct inode *inode, struct iattr *attr)
 
 	/* Check for setting the inode time. */
 	if (ia_valid & (ATTR_MTIME_SET | ATTR_ATIME_SET)) {
-		if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
+		if (!is_owner_or_cap(inode))
 			goto error;
 	}
 fine: