diff options
| author | Tyler Hicks <code@tyhicks.com> | 2021-04-19 04:39:17 +0000 |
|---|---|---|
| committer | Tyler Hicks <code@tyhicks.com> | 2021-04-19 04:39:17 +0000 |
| commit | b7f8f259896f669f131713b0c74ba4d008daa71d (patch) | |
| tree | cb42f2b5e67674b011fcca54594213f43c086e8b /fs/ecryptfs/crypto.c | |
| parent | 902af369942f8d0a6bdaa8466ff0d84d3d9b03a8 (diff) | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff) | |
Merge tag 'v5.12-rc7' into ecryptfs/next
Required to pick up idmapped mount changes which changed some function
parameters.
Diffstat (limited to 'fs/ecryptfs/crypto.c')
| -rw-r--r-- | fs/ecryptfs/crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index be906b9bbb11..7671412b8f0b 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -1110,8 +1110,8 @@ ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry, } inode_lock(lower_inode); - rc = __vfs_setxattr(lower_dentry, lower_inode, ECRYPTFS_XATTR_NAME, - page_virt, size, 0); + rc = __vfs_setxattr(&init_user_ns, lower_dentry, lower_inode, + ECRYPTFS_XATTR_NAME, page_virt, size, 0); if (!rc && ecryptfs_inode) fsstack_copy_attr_all(ecryptfs_inode, lower_inode); inode_unlock(lower_inode); |