Merge tag 'ntfs3_for_6.2' of https://github.com/Paragon-Software-Group/linux-ntfs3

[tomoyo/tomoyo-test1.git] / fs / ntfs3 / namei.c

diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
index 0e72d20..c8db35e 100644 (file)
--- a/fs/ntfs3/namei.c
+++ b/fs/ntfs3/namei.c
@@ -371,7 +371,7 @@ static int ntfs_atomic_open(struct inode *dir, struct dentry *dentry,
                 * ntfs_create_inode -> ntfs_init_acl -> posix_acl_create ->
                 * ntfs_get_acl -> ntfs_get_acl_ex -> ni_lock
                 */
-               struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT);
+               struct posix_acl *p = get_inode_acl(dir, ACL_TYPE_DEFAULT);
 
                if (IS_ERR(p)) {
                        err = PTR_ERR(p);
@@ -598,7 +598,7 @@ const struct inode_operations ntfs_dir_inode_operations = {
        .mknod          = ntfs_mknod,
        .rename         = ntfs_rename,
        .permission     = ntfs_permission,
-       .get_acl        = ntfs_get_acl,
+       .get_inode_acl  = ntfs_get_acl,
        .set_acl        = ntfs_set_acl,
        .setattr        = ntfs3_setattr,
        .getattr        = ntfs_getattr,
@@ -611,7 +611,7 @@ const struct inode_operations ntfs_special_inode_operations = {
        .setattr        = ntfs3_setattr,
        .getattr        = ntfs_getattr,
        .listxattr      = ntfs_listxattr,
-       .get_acl        = ntfs_get_acl,
+       .get_inode_acl  = ntfs_get_acl,
        .set_acl        = ntfs_set_acl,
 };