From: Richard Yao <ryao@gentoo.org>
Date: Mon, 7 Oct 2013 11:30:22 +0000 (-0400)
Subject: Fix order of function calls in zio_free_sync()
X-Git-Tag: zfs-0.6.3~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c8417933f11d2bda734056f34f5d7c982acbcec;p=zfs

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 <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1775
---

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,