diff options
| author | Matthew Macy <[email protected]> | 2019-10-02 09:15:12 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-10-02 09:15:12 -0700 |
| commit | 6360e2779e47f4bf2233071b427ad522eca9bdd4 (patch) | |
| tree | 2b60eb443d5893b4a281df72658ecc8bc2030e14 /module/zfs/zfs_log.c | |
| parent | 13a4027a7cd68069cb252e94c18ba1e5eb5af1cd (diff) | |
Add inode accessors to common code
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Jorgen Lundman <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #9389
Diffstat (limited to 'module/zfs/zfs_log.c')
| -rw-r--r-- | module/zfs/zfs_log.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/module/zfs/zfs_log.c b/module/zfs/zfs_log.c index ae4cbdec1..8b7c594f8 100644 --- a/module/zfs/zfs_log.c +++ b/module/zfs/zfs_log.c @@ -322,13 +322,13 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype, /* Store dnode slot count in 8 bits above object id. */ LR_FOID_SET_SLOTS(lr->lr_foid, zp->z_dnodesize >> DNODE_SHIFT); lr->lr_mode = zp->z_mode; - if (!IS_EPHEMERAL(KUID_TO_SUID(ZTOI(zp)->i_uid))) { - lr->lr_uid = (uint64_t)KUID_TO_SUID(ZTOI(zp)->i_uid); + if (!IS_EPHEMERAL(KUID_TO_SUID(ZTOUID(zp)))) { + lr->lr_uid = (uint64_t)KUID_TO_SUID(ZTOUID(zp)); } else { lr->lr_uid = fuidp->z_fuid_owner; } - if (!IS_EPHEMERAL(KGID_TO_SGID(ZTOI(zp)->i_gid))) { - lr->lr_gid = (uint64_t)KGID_TO_SGID(ZTOI(zp)->i_gid); + if (!IS_EPHEMERAL(KGID_TO_SGID(ZTOGID(zp)))) { + lr->lr_gid = (uint64_t)KGID_TO_SGID(ZTOGID(zp)); } else { lr->lr_gid = fuidp->z_fuid_group; } @@ -460,8 +460,8 @@ zfs_log_symlink(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype, lr = (lr_create_t *)&itx->itx_lr; lr->lr_doid = dzp->z_id; lr->lr_foid = zp->z_id; - lr->lr_uid = KUID_TO_SUID(ZTOI(zp)->i_uid); - lr->lr_gid = KGID_TO_SGID(ZTOI(zp)->i_gid); + lr->lr_uid = KUID_TO_SUID(ZTOUID(zp)); + lr->lr_gid = KGID_TO_SGID(ZTOGID(zp)); lr->lr_mode = zp->z_mode; (void) sa_lookup(zp->z_sa_hdl, SA_ZPL_GEN(ZTOZSB(zp)), &lr->lr_gen, sizeof (uint64_t)); |