projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
fs
/
ext4
/
inode.c
diff --git
a/fs/ext4/inode.c
b/fs/ext4/inode.c
index 31fa964742bcba1b0f9dbd494e469feb56ee8428..fe4793e754d11b2963740751be9864d0b45fbd2e 100644
(file)
--- a/
fs/ext4/inode.c
+++ b/
fs/ext4/inode.c
@@
-4667,7
+4667,7
@@
int ext4_setattr(struct dentry *dentry, struct iattr *attr)
ext4_orphan_del(NULL, inode);
if (!rc && (ia_valid & ATTR_MODE))
- rc =
ext4_acl_chmod(in
ode);
+ rc =
posix_acl_chmod(inode, inode->i_m
ode);
err_out:
ext4_std_error(inode->i_sb, error);