diff options
| author | Matthew Ahrens <[email protected]> | 2017-02-24 13:34:26 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-24 13:34:26 -0800 |
| commit | 66eead53c9d2480f2a464ef170920953431ad200 (patch) | |
| tree | 14f8e0ab26d9c89503e36d74a49a906a89e0a9bf /include/sys | |
| parent | f7e76821c525a7764a01f4a0e16aa9e2b77e3170 (diff) | |
Clean up by-dnode code in dmu_tx.c
https://github.com/zfsonlinux/zfs/commit/0eef1bde31d67091d3deed23fe2394f5a8bf2276
introduced some changes which we slightly improved the style of when
porting to illumos.
There is also one minor error-handling fix, in zap_add() the "zap" may
become NULL in case of an error re-opening the ZAP.
Originally suggested at: https://github.com/openzfs/openzfs/pull/276
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed by: Pavel Zakharov <[email protected]>
Signed-off-by: Matthew Ahrens <[email protected]>
Closes #5805
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/dmu_tx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sys/dmu_tx.h b/include/sys/dmu_tx.h index 7d2fdab29..1ee513fdc 100644 --- a/include/sys/dmu_tx.h +++ b/include/sys/dmu_tx.h @@ -171,7 +171,7 @@ extern dmu_tx_t *dmu_tx_create_assigned(struct dsl_pool *dp, uint64_t txg); dmu_tx_t *dmu_tx_create_dd(dsl_dir_t *dd); int dmu_tx_is_syncing(dmu_tx_t *tx); int dmu_tx_private_ok(dmu_tx_t *tx); -void dmu_tx_add_new_object(dmu_tx_t *tx, objset_t *os, dnode_t *dn); +void dmu_tx_add_new_object(dmu_tx_t *tx, dnode_t *dn); void dmu_tx_willuse_space(dmu_tx_t *tx, int64_t delta); void dmu_tx_dirty_buf(dmu_tx_t *tx, struct dmu_buf_impl *db); int dmu_tx_holds(dmu_tx_t *tx, uint64_t object); |