diff options
| author | Tyler Hicks <code@tyhicks.com> | 2021-04-19 07:39:17 +0300 |
|---|---|---|
| committer | Tyler Hicks <code@tyhicks.com> | 2021-04-19 07:39:17 +0300 |
| commit | b7f8f259896f669f131713b0c74ba4d008daa71d (patch) | |
| tree | cb42f2b5e67674b011fcca54594213f43c086e8b /fs/jfs/jfs_acl.h | |
| parent | 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 (diff) | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff) | |
| download | linux-b7f8f259896f669f131713b0c74ba4d008daa71d.tar.xz | |
Merge tag 'v5.12-rc7' into ecryptfs/next
Required to pick up idmapped mount changes which changed some function
parameters.
Diffstat (limited to 'fs/jfs/jfs_acl.h')
| -rw-r--r-- | fs/jfs/jfs_acl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h index 9f8f92dd6f84..7ae389a7a366 100644 --- a/fs/jfs/jfs_acl.h +++ b/fs/jfs/jfs_acl.h @@ -8,7 +8,8 @@ #ifdef CONFIG_JFS_POSIX_ACL struct posix_acl *jfs_get_acl(struct inode *inode, int type); -int jfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); +int jfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, + struct posix_acl *acl, int type); int jfs_init_acl(tid_t, struct inode *, struct inode *); #else |