diff options
| author | Richard Yao <[email protected]> | 2013-07-14 12:59:24 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-08-09 15:31:52 -0700 |
| commit | 570d6edf1d94917aab49c5755027d05b3c7bcd43 (patch) | |
| tree | 979e02ad02f201bec3d4ad1c23ffb828e463fdbc /module/zfs/zfs_znode.c | |
| parent | fadd0c4da1e2ccd6014800d8b1a0fd117dd323e8 (diff) | |
Linux 3.8 compat: Support CONFIG_UIDGID_STRICT_TYPE_CHECKS
When CONFIG_UIDGID_STRICT_TYPE_CHECKS is enabled uid_t/git_t are
replaced by kuid_t/kgid_t, which are structures instead of integral
types. This causes any code that uses an integral type to fail to build.
The User Namespace functionality introduced in Linux 3.8 requires
CONFIG_UIDGID_STRICT_TYPE_CHECKS, so we could not build against any
kernel that supported it.
We resolve this by converting between the new kuid_t/kgid_t structures
and the original uid_t/gid_t types.
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1589
Diffstat (limited to 'module/zfs/zfs_znode.c')
| -rw-r--r-- | module/zfs/zfs_znode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c index 5922d3afa..aaf17e18f 100644 --- a/module/zfs/zfs_znode.c +++ b/module/zfs/zfs_znode.c @@ -472,8 +472,8 @@ zfs_inode_update(znode_t *zp) spin_lock(&ip->i_lock); ip->i_generation = zp->z_gen; - ip->i_uid = zp->z_uid; - ip->i_gid = zp->z_gid; + ip->i_uid = SUID_TO_KUID(zp->z_uid); + ip->i_gid = SGID_TO_KGID(zp->z_gid); set_nlink(ip, zp->z_links); ip->i_mode = zp->z_mode; ip->i_blkbits = SPA_MINBLOCKSHIFT; |