diff options
-rw-r--r-- | module/zfs/zfs_fuid.c | 8 | ||||
-rw-r--r-- | module/zfs/zfs_vnops.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/module/zfs/zfs_fuid.c b/module/zfs/zfs_fuid.c index f1e071fc7..ca03373c7 100644 --- a/module/zfs/zfs_fuid.c +++ b/module/zfs/zfs_fuid.c @@ -639,10 +639,10 @@ zfs_fuid_create(zfs_sb_t *zsb, uint64_t id, cred_t *cr, } return (FUID_ENCODE(idx, rid)); #else - if (type == ZFS_OWNER) - return crgetuid(cr); - else - return crgetgid(cr); + /* + * The Linux port only supports POSIX IDs, use the passed id. + */ + return (id); #endif } diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index fcc85b8a0..b20e3b2c3 100644 --- a/module/zfs/zfs_vnops.c +++ b/module/zfs/zfs_vnops.c @@ -2575,7 +2575,7 @@ out: } else { err2 = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx); dmu_tx_commit(tx); - zfs_inode_update(zp); + zfs_inode_update(zp); } out2: |