diff options
author | Christian Brauner <brauner@kernel.org> | 2022-10-24 17:43:21 +0300 |
---|---|---|
committer | Christian Brauner (Microsoft) <brauner@kernel.org> | 2022-10-24 17:43:21 +0300 |
commit | 03fd1402bd7d93bd4598fc961632ef2737a500fd (patch) | |
tree | 5c327eae239d9466d0e80c9974903ed4d4babb94 /fs/erofs/inode.c | |
parent | b4dd412d4a6231de100ae8ce2a9e1ed649f9e748 (diff) | |
parent | 0a26bde2c9db9817e2b4c0f890236f78d4d8ed7c (diff) | |
download | linux-03fd1402bd7d93bd4598fc961632ef2737a500fd.tar.xz |
Merge branch 'fs.acl.rework' into for-next
Diffstat (limited to 'fs/erofs/inode.c')
-rw-r--r-- | fs/erofs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index ad2a82f2eb4c..2d571343deec 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -371,7 +371,7 @@ int erofs_getattr(struct user_namespace *mnt_userns, const struct path *path, const struct inode_operations erofs_generic_iops = { .getattr = erofs_getattr, .listxattr = erofs_listxattr, - .get_acl = erofs_get_acl, + .get_inode_acl = erofs_get_acl, .fiemap = erofs_fiemap, }; @@ -379,12 +379,12 @@ const struct inode_operations erofs_symlink_iops = { .get_link = page_get_link, .getattr = erofs_getattr, .listxattr = erofs_listxattr, - .get_acl = erofs_get_acl, + .get_inode_acl = erofs_get_acl, }; const struct inode_operations erofs_fast_symlink_iops = { .get_link = simple_get_link, .getattr = erofs_getattr, .listxattr = erofs_listxattr, - .get_acl = erofs_get_acl, + .get_inode_acl = erofs_get_acl, }; |