OpenZFS 6513 - partially filled holes lose birth time

[mirror_zfs.git] / module / zfs / dmu.c

diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
index 7862878341833979441c3a32f72cc225e54b5072..a423264c6d0689891afad8148a4c848c28fdedc9 100644 (file)
--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@ -20,8 +20,9 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2015 by Chunwei Chen. All rights reserved.
  */
@@ -1480,10 +1481,11 @@ dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
        dsa->dsa_zgd = zgd;
        dsa->dsa_tx = tx;
 
-       zio_nowait(zio_write(pio, os->os_spa, dmu_tx_get_txg(tx), zgd->zgd_bp,
-           zgd->zgd_db->db_data, zgd->zgd_db->db_size, zp,
-           dmu_sync_late_arrival_ready, NULL, dmu_sync_late_arrival_done, dsa,
-           ZIO_PRIORITY_SYNC_WRITE, ZIO_FLAG_CANFAIL|ZIO_FLAG_FASTWRITE, zb));
+       zio_nowait(zio_write(pio, os->os_spa, dmu_tx_get_txg(tx),
+           zgd->zgd_bp, zgd->zgd_db->db_data, zgd->zgd_db->db_size,
+           zp, dmu_sync_late_arrival_ready, NULL,
+           NULL, dmu_sync_late_arrival_done, dsa, ZIO_PRIORITY_SYNC_WRITE,
+           ZIO_FLAG_CANFAIL, zb));
 
        return (0);
 }
@@ -1636,8 +1638,8 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
        zio_nowait(arc_write(pio, os->os_spa, txg,
            bp, dr->dt.dl.dr_data, DBUF_IS_L2CACHEABLE(db),
            DBUF_IS_L2COMPRESSIBLE(db), &zp, dmu_sync_ready,
-           NULL, dmu_sync_done, dsa, ZIO_PRIORITY_SYNC_WRITE,
-           ZIO_FLAG_CANFAIL, &zb));
+           NULL, NULL, dmu_sync_done, dsa,
+           ZIO_PRIORITY_SYNC_WRITE, ZIO_FLAG_CANFAIL, &zb));
 
        return (0);
 }