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/hfsplus/hfsplus_fs.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/hfsplus/hfsplus_fs.h')
| -rw-r--r-- | fs/hfsplus/hfsplus_fs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index a92de5199ec3..12b20479ed2b 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h @@ -488,8 +488,9 @@ void hfsplus_inode_write_fork(struct inode *inode, struct hfsplus_fork_raw *fork); int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd); int hfsplus_cat_write_inode(struct inode *inode); -int hfsplus_getattr(const struct path *path, struct kstat *stat, - u32 request_mask, unsigned int query_flags); +int hfsplus_getattr(struct user_namespace *mnt_userns, const struct path *path, + struct kstat *stat, u32 request_mask, + unsigned int query_flags); int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end, int datasync); |