diff options
| author | Nikolay Borisov <[email protected]> | 2016-08-04 00:31:08 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-08-08 10:47:43 -0700 |
| commit | 64aefee1b847b747147016c039f5b0e276a9e1b7 (patch) | |
| tree | 09896b05f5b44ce499c75148558c8ff347bc0eca /include | |
| parent | 938cfeb0f27303721081223816d4f251ffeb1767 (diff) | |
Fix interaction between userns uid/gid and SA
* 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 <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4928
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/trace_acl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sys/trace_acl.h b/include/sys/trace_acl.h index bd19c5a16..a49e8b4c0 100644 --- a/include/sys/trace_acl.h +++ b/include/sys/trace_acl.h @@ -99,8 +99,8 @@ DECLARE_EVENT_CLASS(zfs_ace_class, __entry->z_is_ctldir = zn->z_is_ctldir; __entry->z_is_stale = zn->z_is_stale; - __entry->i_uid = zfs_uid_read(ZTOI(zn)); - __entry->i_gid = zfs_gid_read(ZTOI(zn)); + __entry->i_uid = KUID_TO_SUID(ZTOI(zn)->i_uid); + __entry->i_gid = KGID_TO_SGID(ZTOI(zn)->i_gid); __entry->i_ino = zn->z_inode.i_ino; __entry->i_nlink = zn->z_inode.i_nlink; __entry->i_version = zn->z_inode.i_version; |