summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2013-10-07 07:30:22 -0400
committerBrian Behlendorf <[email protected]>2013-10-29 15:06:18 -0700
commit8c8417933f11d2bda734056f34f5d7c982acbcec (patch)
tree29a324c1b19011638dad2684406a7d1c5138eeaf
parent9cac042cfeccb2d3ecc5a96c0c2ba9afe631338b (diff)
Fix order of function calls in zio_free_sync()
The resolution of a merge conflict when merging Illumos #3464 caused us to invert the order couple of function calls in zio_free_sync() versus what they are in Illumos. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #1775
-rw-r--r--module/zfs/zio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 0e2b463ac..237825662 100644
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -784,9 +784,8 @@ zio_free_sync(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
ASSERT(spa_syncing_txg(spa) == txg);
ASSERT(spa_sync_pass(spa) < zfs_sync_pass_deferred_free);
- arc_freed(spa, bp);
-
metaslab_check_free(spa, bp);
+ arc_freed(spa, bp);
zio = zio_create(pio, spa, txg, bp, NULL, BP_GET_PSIZE(bp),
NULL, NULL, ZIO_TYPE_FREE, ZIO_PRIORITY_FREE, flags,