diff options
| author | Brian Behlendorf <[email protected]> | 2016-04-13 08:55:35 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-04-21 09:49:25 -0700 |
| commit | da5e151f207ff1bc4972ce74a3a85e442ffd5a03 (patch) | |
| tree | 59fcc326b6ad69b36bc9f06bf1dd25a23afee34c /module/zfs/zfs_replay.c | |
| parent | 8fc5674c522e22f0b97e4714bf5410e24d481afa (diff) | |
Add pn_alloc()/pn_free() functions
In order to remove the HAVE_PN_UTILS wrappers the pn_alloc() and
pn_free() functions must be implemented. The existing illumos
implementation were used for this purpose.
The `flags` argument which was used in places wrapped by the
HAVE_PN_UTILS condition has beed added back to zfs_remove() and
zfs_link() functions. This removes a small point of divergence
between the ZoL code and upstream.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #4522
Diffstat (limited to 'module/zfs/zfs_replay.c')
| -rw-r--r-- | module/zfs/zfs_replay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_replay.c b/module/zfs/zfs_replay.c index 0ca1e03b5..b97a60ed8 100644 --- a/module/zfs/zfs_replay.c +++ b/module/zfs/zfs_replay.c @@ -548,7 +548,7 @@ zfs_replay_remove(zfs_sb_t *zsb, lr_remove_t *lr, boolean_t byteswap) switch ((int)lr->lr_common.lrc_txtype) { case TX_REMOVE: - error = zfs_remove(ZTOI(dzp), name, kcred); + error = zfs_remove(ZTOI(dzp), name, kcred, vflg); break; case TX_RMDIR: error = zfs_rmdir(ZTOI(dzp), name, NULL, kcred, vflg); @@ -584,7 +584,7 @@ zfs_replay_link(zfs_sb_t *zsb, lr_link_t *lr, boolean_t byteswap) if (lr->lr_common.lrc_txtype & TX_CI) vflg |= FIGNORECASE; - error = zfs_link(ZTOI(dzp), ZTOI(zp), name, kcred); + error = zfs_link(ZTOI(dzp), ZTOI(zp), name, kcred, vflg); iput(ZTOI(zp)); iput(ZTOI(dzp)); |