c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-06-06 22:16:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix interaction between userns uid/gid and SA

Browse Source 
* When the uid/gid change is handled in zfs_setattr we want to
actually adjust the user passed uid to a KUID and write that to disk.

* In trace points use the i_uid member without doing translation,
since it has already been performed.

* Use kuid in zfs_aclset_common

Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4928
This commit is contained in:
Nikolay Borisov
2016-08-04 00:31:08 +03:00
committed by Brian Behlendorf
parent 938cfeb0f2
commit 64aefee1b8
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/zfs_acl.c
+1 -1
View File
@@ -1326,7 +1326,7 @@ zfs_aclset_common(znode_t *zp, zfs_acl_t *aclp, cred_t *cr, dmu_tx_t *tx)
mode = zp->z_mode;
mode = zfs_mode_compute(mode, aclp, &zp->z_pflags,
zfs_uid_read(ZTOI(zp)), zfs_gid_read(ZTOI(zp)));
KUID_TO_SUID(ZTOI(zp)->i_uid), KGID_TO_SGID(ZTOI(zp)->i_gid));
zp->z_mode = mode;
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MODE(zsb), NULL,