Merge tag 'for-6.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[sfrench/cifs-2.6.git] / fs / btrfs / inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index bfcbe64eb8b3a7526a7d328484a36cac6602086f..2ead7b1bdbaf141489ac3186f2d7817d18aa636d 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5307,7 +5307,7 @@ static int btrfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentr
                err = btrfs_dirty_inode(BTRFS_I(inode));
 
                if (!err && attr->ia_valid & ATTR_MODE)
-                       err = posix_acl_chmod(mnt_userns, inode, inode->i_mode);
+                       err = posix_acl_chmod(mnt_userns, dentry, inode->i_mode);
        }
 
        return err;
@@ -11362,7 +11362,7 @@ static const struct inode_operations btrfs_dir_inode_operations = {
        .mknod          = btrfs_mknod,
        .listxattr      = btrfs_listxattr,
        .permission     = btrfs_permission,
-       .get_acl        = btrfs_get_acl,
+       .get_inode_acl  = btrfs_get_acl,
        .set_acl        = btrfs_set_acl,
        .update_time    = btrfs_update_time,
        .tmpfile        = btrfs_tmpfile,
@@ -11415,7 +11415,7 @@ static const struct inode_operations btrfs_file_inode_operations = {
        .listxattr      = btrfs_listxattr,
        .permission     = btrfs_permission,
        .fiemap         = btrfs_fiemap,
-       .get_acl        = btrfs_get_acl,
+       .get_inode_acl  = btrfs_get_acl,
        .set_acl        = btrfs_set_acl,
        .update_time    = btrfs_update_time,
        .fileattr_get   = btrfs_fileattr_get,
@@ -11426,7 +11426,7 @@ static const struct inode_operations btrfs_special_inode_operations = {
        .setattr        = btrfs_setattr,
        .permission     = btrfs_permission,
        .listxattr      = btrfs_listxattr,
-       .get_acl        = btrfs_get_acl,
+       .get_inode_acl  = btrfs_get_acl,
        .set_acl        = btrfs_set_acl,
        .update_time    = btrfs_update_time,
 };