]> granicus.if.org Git - zfs/commitdiff
Fix order of function calls in zio_free_sync()
authorRichard Yao <ryao@gentoo.org>
Mon, 7 Oct 2013 11:30:22 +0000 (07:30 -0400)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 29 Oct 2013 22:06:18 +0000 (15:06 -0700)
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

module/zfs/zio.c

index 0e2b463ac9e2309f1c8a4d71d23aef5e8c6f35ea..2378256623bb8fce41d8a77647616b8abc9eff83 100644 (file)
@@ -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,