Merge tag 'fs.acl.rework.v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs...

[sfrench/cifs-2.6.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 82911fefc2d5e55a539f21ee076e82add4bdcc78..c45eaf04396e3cc614b88eb8b0e6a0a255dac489 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1132,7 +1132,7 @@ static int shmem_setattr(struct user_namespace *mnt_userns,
 
        setattr_copy(&init_user_ns, inode, attr);
        if (attr->ia_valid & ATTR_MODE)
-               error = posix_acl_chmod(&init_user_ns, inode, inode->i_mode);
+               error = posix_acl_chmod(&init_user_ns, dentry, inode->i_mode);
        if (!error && update_ctime) {
                inode->i_ctime = current_time(inode);
                if (update_mtime)