summaryrefslogtreecommitdiffstats
path: root/module/zfs/dmu_recv.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2019-04-12 11:30:59 -0700
committerGitHub <[email protected]>2019-04-12 11:30:59 -0700
commit3fa93bb8d3f0c757814b96a98ce3334d132894f1 (patch)
treef0a45567ea59be860d5c06fc8f940fe09f87cb9d /module/zfs/dmu_recv.c
parent9e3485abfcff126654c98aa64512505e603215d0 (diff)
Fix TXG_MASK cstyle
Fix style issue for 'tx->tx_txg&TXG_MASK'. There should be white space around the '&' character. Split the dnode_reallocate() ASSERT to make it more readable to clearly separate the checks. Reviewed-by: George Melikov <[email protected]> Reviewed-by: Tom Caputi <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #8606
Diffstat (limited to 'module/zfs/dmu_recv.c')
-rw-r--r--module/zfs/dmu_recv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/dmu_recv.c b/module/zfs/dmu_recv.c
index 0fa3dfad3..6b9404754 100644
--- a/module/zfs/dmu_recv.c
+++ b/module/zfs/dmu_recv.c
@@ -1280,7 +1280,6 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro,
return (err);
err = dmu_free_long_object(rwa->os, slot);
-
if (err != 0)
return (err);
@@ -1316,6 +1315,7 @@ receive_object(struct receive_writer_arg *rwa, struct drr_object *drro,
drro->drr_bonustype, drro->drr_bonuslen,
dn_slots << DNODE_SHIFT, tx);
}
+
if (err != 0) {
dmu_tx_commit(tx);
return (SET_ERROR(EINVAL));