diff options
| author | Brian Behlendorf <[email protected]> | 2009-01-15 13:59:39 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-01-15 13:59:39 -0800 |
| commit | fb5f0bc83330c8a0236c4d34a23723ac1974971a (patch) | |
| tree | 51880dcfa8ec9e8e80b8c44e9ffc55a4b7160216 /module/zfs/zfs_fuid.c | |
| parent | 42bcb36c8987b0b11411ce6cf8339694b624a17c (diff) | |
Rebase master to b105
Diffstat (limited to 'module/zfs/zfs_fuid.c')
| -rw-r--r-- | module/zfs/zfs_fuid.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/zfs/zfs_fuid.c b/module/zfs/zfs_fuid.c index 7cb505258..286dafba8 100644 --- a/module/zfs/zfs_fuid.c +++ b/module/zfs/zfs_fuid.c @@ -519,7 +519,6 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr, uint32_t rid; idmap_stat status; uint64_t idx; - boolean_t is_replay = (zfsvfs->z_assign >= TXG_INITIAL); zfs_fuid_t *zfuid = NULL; zfs_fuid_info_t *fuidp; @@ -534,7 +533,7 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr, if (!zfsvfs->z_use_fuids || !IS_EPHEMERAL(id) || fuid_idx != 0) return (id); - if (is_replay) { + if (zfsvfs->z_replay) { fuidp = zfsvfs->z_fuid_replay; /* @@ -584,7 +583,7 @@ zfs_fuid_create(zfsvfs_t *zfsvfs, uint64_t id, cred_t *cr, idx = zfs_fuid_find_by_domain(zfsvfs, domain, &kdomain, tx); - if (!is_replay) + if (!zfsvfs->z_replay) zfs_fuid_node_add(fuidpp, kdomain, rid, idx, id, type); else if (zfuid != NULL) { list_remove(&fuidp->z_fuids, zfuid); |