diff options
| author | Nikolay Borisov <[email protected]> | 2016-05-22 14:15:57 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-07-25 13:21:49 -0700 |
| commit | 2c6abf15ff5bcc979653eef0131f90d4f0fede21 (patch) | |
| tree | 29bc74006a16d50335196ccd1e7459b569e48b57 /module/zfs/zfs_vfsops.c | |
| parent | 82a1b2d6289f9ceae0bee6f1e71d3bc29a8c5d16 (diff) | |
Remove znode's z_uid/z_gid member
Remove duplicate z_uid/z_gid member which are also held in the
generic vfs inode struct. This is done by first removing the members
from struct znode and then using the KUID_TO_SUID/KGID_TO_SGID
macros to access the respective member from struct inode. In cases
where the uid/gids are being marshalled from/to disk, use the newly
introduced zfs_(uid|gid)_(read|write) functions to properly
save the uids rather than the internal kernel representation.
Signed-off-by: Nikolay Borisov <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #4685
Issue #227
Diffstat (limited to 'module/zfs/zfs_vfsops.c')
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 848651091..d8b27461a 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -627,10 +627,11 @@ zfs_owner_overquota(zfs_sb_t *zsb, znode_t *zp, boolean_t isgroup) { uint64_t fuid; uint64_t quotaobj; + struct inode *ip = ZTOI(zp); quotaobj = isgroup ? zsb->z_groupquota_obj : zsb->z_userquota_obj; - fuid = isgroup ? zp->z_gid : zp->z_uid; + fuid = isgroup ? KGID_TO_SGID(ip->i_gid) : KUID_TO_SUID(ip->i_uid); if (quotaobj == 0 || zsb->z_replay) return (B_FALSE); |