projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
fs
/
attr.c
diff --git
a/fs/attr.c
b/fs/attr.c
index
a0a0c7b
..
f8dfc22
100644
(file)
--- 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) {
/* 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 :
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)) {
/* 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:
goto error;
}
fine: