Merge branch 'master-0.6.7-rc7.1'

zfsonlinux · Mar 21, 2012 · 8ba3cb2 · 8ba3cb2
2 parents 592cf25 + 7cfecac
commit 8ba3cb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+zfs-linux (0.6.0.54-1ubuntu1) unstable; urgency=low
+
+  [ Brian Behlendorf ]
+  * Revert "Add zio constructor/destructor"
+  * Add zio constructor/destructor
+
+ -- Darik Horn <[email protected]>  Wed, 21 Mar 2012 17:42:33 -0500
+
 zfs-linux (0.6.0.54-0ubuntu1) unstable; urgency=low
 
   [ Gregor Kopka ]

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
@@ -551,6 +551,7 @@ zio_create(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
 		zio->io_child_type = ZIO_CHILD_LOGICAL;
 
 	if (bp != NULL) {
+		zio->io_logical = NULL;
 		zio->io_bp = (blkptr_t *)bp;
 		zio->io_bp_copy = *bp;
 		zio->io_bp_orig = *bp;