Illumos 4914 - zfs on-disk bookmark structure should be named *_phys_t

4914 zfs on-disk bookmark structure should be named *_phys_t

Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Saso Kiselkov <skiselkov.ml@gmail.com>
Approved by: Robert Mustacchi <rm@joyent.com>

References:
  https://www.illumos.org/issues/4914
  https://github.com/illumos/illumos-gate/commit/7802d7b

Porting notes:

There were a number of zfsonlinux-specific uses of zbookmark_t which
needed to be updated.  This should reduce the likelihood of further
problems like issue #2094 from occurring.

Ported by: Tim Chase <tim@chase2k.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2558

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
index dcb77c24ddbc1d83783d645df908f82363139659..5a5fe53a29fa649fc6bbbcce17c80cd39a76d8a5 100644 (file)
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <stdio.h>
@@ -1019,7 +1019,8 @@ dump_dnode(objset_t *os, uint64_t object, void *data, size_t size)
 }
 
 static uint64_t
-blkid2offset(const dnode_phys_t *dnp, const blkptr_t *bp, const zbookmark_t *zb)
+blkid2offset(const dnode_phys_t *dnp, const blkptr_t *bp,
+    const zbookmark_phys_t *zb)
 {
        if (dnp == NULL) {
                ASSERT(zb->zb_level < 0);
@@ -1083,7 +1084,7 @@ snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp)
 }
 
 static void
-print_indirect(blkptr_t *bp, const zbookmark_t *zb,
+print_indirect(blkptr_t *bp, const zbookmark_phys_t *zb,
     const dnode_phys_t *dnp)
 {
        char blkbuf[BP_SPRINTF_LEN];
@@ -1112,7 +1113,7 @@ print_indirect(blkptr_t *bp, const zbookmark_t *zb,
 
 static int
 visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
-    blkptr_t *bp, const zbookmark_t *zb)
+    blkptr_t *bp, const zbookmark_phys_t *zb)
 {
        int err = 0;
 
@@ -1138,7 +1139,7 @@ visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
                /* recursively visit blocks below this */
                cbp = buf->b_data;
                for (i = 0; i < epb; i++, cbp++) {
-                       zbookmark_t czb;
+                       zbookmark_phys_t czb;
 
                        SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
                            zb->zb_level - 1,
@@ -1162,7 +1163,7 @@ dump_indirect(dnode_t *dn)
 {
        dnode_phys_t *dnp = dn->dn_phys;
        int j;
-       zbookmark_t czb;
+       zbookmark_phys_t czb;
 
        (void) printf("Indirect blocks:\n");
 
@@ -2261,7 +2262,7 @@ zdb_blkptr_done(zio_t *zio)
        blkptr_t *bp = zio->io_bp;
        int ioerr = zio->io_error;
        zdb_cb_t *zcb = zio->io_private;
-       zbookmark_t *zb = &zio->io_bookmark;
+       zbookmark_phys_t *zb = &zio->io_bookmark;
 
        zio_data_buf_free(zio->io_data, zio->io_size);
 
@@ -2295,7 +2296,7 @@ zdb_blkptr_done(zio_t *zio)
 
 static int
 zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        zdb_cb_t *zcb = arg;
        dmu_object_type_t type;
@@ -2753,7 +2754,7 @@ typedef struct zdb_ddt_entry {
 /* ARGSUSED */
 static int
 zdb_ddt_add_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        avl_tree_t *t = arg;
        avl_index_t where;

diff --git a/cmd/zdb/zdb_il.c b/cmd/zdb/zdb_il.c
index 371a09bcdb39d1b589b4576303e72b6b410bc23d..b85ef7ddd97e48f202076841420a93607f6adb6e 100644 (file)
--- a/cmd/zdb/zdb_il.c
+++ b/cmd/zdb/zdb_il.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -123,7 +123,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
 {
        char *data, *dlimit;
        blkptr_t *bp = &lr->lr_blkptr;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        char buf[SPA_MAXBLOCKSIZE];
        int verbose = MAX(dump_opt['d'], dump_opt['i']);
        int error;

diff --git a/include/sys/arc.h b/include/sys/arc.h
index 005d0717938d128cfe62a8fc6affbae1c347e581..8e0843418ac324449ced6923b44ae9fb11961311 100644 (file)
--- a/include/sys/arc.h
+++ b/include/sys/arc.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -147,12 +147,12 @@ int arc_referenced(arc_buf_t *buf);
 
 int arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
     arc_done_func_t *done, void *private, zio_priority_t priority, int flags,
-    uint32_t *arc_flags, const zbookmark_t *zb);
+    uint32_t *arc_flags, const zbookmark_phys_t *zb);
 zio_t *arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
     blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc, boolean_t l2arc_compress,
     const zio_prop_t *zp, arc_done_func_t *ready, arc_done_func_t *physdone,
     arc_done_func_t *done, void *private, zio_priority_t priority,
-    int zio_flags, const zbookmark_t *zb);
+    int zio_flags, const zbookmark_phys_t *zb);
 
 arc_prune_t *arc_add_prune_callback(arc_prune_func_t *func, void *private);
 void arc_remove_prune_callback(arc_prune_t *p);

diff --git a/include/sys/bptree.h b/include/sys/bptree.h
index a533cb949021e475dcb7d427266957783e41f066..327c128bf493c52218a4d99a9b422c527727a96e 100644 (file)
--- a/include/sys/bptree.h
+++ b/include/sys/bptree.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef        _SYS_BPTREE_H
@@ -43,7 +43,7 @@ typedef struct bptree_phys {
 typedef struct bptree_entry_phys {
        blkptr_t be_bp;
        uint64_t be_birth_txg; /* only delete blocks born after this txg */
-       zbookmark_t be_zb; /* holds traversal resume point if needed */
+       zbookmark_phys_t be_zb; /* holds traversal resume point if needed */
 } bptree_entry_phys_t;
 
 typedef int bptree_itor_t(void *arg, const blkptr_t *bp, dmu_tx_t *tx);

diff --git a/include/sys/dmu.h b/include/sys/dmu.h
index aa3e8f25aa747a7f236c4c79485c5fefeeb03f75..2cf4a4bdda6b558618e704f4631d27c5f8893bd2 100644 (file)
--- a/include/sys/dmu.h
+++ b/include/sys/dmu.h
@@ -62,7 +62,7 @@ struct dsl_pool;
 struct dnode;
 struct drr_begin;
 struct drr_end;
-struct zbookmark;
+struct zbookmark_phys;
 struct spa;
 struct nvlist;
 struct arc_buf;

diff --git a/include/sys/dmu_traverse.h b/include/sys/dmu_traverse.h
index bc1590bc3aa8466460604fb30653ac70832905df..544b721e46129a06f5bc3d86ec8e9c3e6d685be1 100644 (file)
--- a/include/sys/dmu_traverse.h
+++ b/include/sys/dmu_traverse.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef        _SYS_DMU_TRAVERSE_H
@@ -40,7 +40,7 @@ struct zilog;
 struct arc_buf;
 
 typedef int (blkptr_cb_t)(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const struct dnode_phys *dnp, void *arg);
+    const zbookmark_phys_t *zb, const struct dnode_phys *dnp, void *arg);
 
 #define        TRAVERSE_PRE                    (1<<0)
 #define        TRAVERSE_POST                   (1<<1)
@@ -55,7 +55,7 @@ typedef int (blkptr_cb_t)(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 int traverse_dataset(struct dsl_dataset *ds,
     uint64_t txg_start, int flags, blkptr_cb_t func, void *arg);
 int traverse_dataset_destroyed(spa_t *spa, blkptr_t *blkptr,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg);
 int traverse_pool(spa_t *spa,
     uint64_t txg_start, int flags, blkptr_cb_t func, void *arg);

diff --git a/include/sys/dsl_scan.h b/include/sys/dsl_scan.h
index de6a7d17a3efa9c57b739acf3577920881868b63..44a11ba5720776f570830402445bdd26a471a60d 100644 (file)
--- a/include/sys/dsl_scan.h
+++ b/include/sys/dsl_scan.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef        _SYS_DSL_SCAN_H
@@ -62,7 +62,7 @@ typedef struct dsl_scan_phys {
        uint64_t scn_errors;    /* scan I/O error count */
        uint64_t scn_ddt_class_max;
        ddt_bookmark_t scn_ddt_bookmark;
-       zbookmark_t scn_bookmark;
+       zbookmark_phys_t scn_bookmark;
        uint64_t scn_flags; /* dsl_scan_flags_t */
 } dsl_scan_phys_t;
 

diff --git a/include/sys/spa.h b/include/sys/spa.h
index 707b1987a77564920a282067fd28d25dfc135d65..cc9569255f48e6581c77f6968e924da01069cf9b 100644 (file)
--- a/include/sys/spa.h
+++ b/include/sys/spa.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  */
 
@@ -51,7 +51,7 @@ typedef struct zilog zilog_t;
 typedef struct spa_aux_vdev spa_aux_vdev_t;
 typedef struct ddt ddt_t;
 typedef struct ddt_entry ddt_entry_t;
-typedef struct zbookmark zbookmark_t;
+typedef struct zbookmark_phys zbookmark_phys_t;
 
 struct dsl_pool;
 struct dsl_dataset;
@@ -720,7 +720,7 @@ typedef enum txg_state {
 
 extern void spa_stats_init(spa_t *spa);
 extern void spa_stats_destroy(spa_t *spa);
-extern void spa_read_history_add(spa_t *spa, const zbookmark_t *zb,
+extern void spa_read_history_add(spa_t *spa, const zbookmark_phys_t *zb,
     uint32_t aflags);
 extern void spa_txg_history_add(spa_t *spa, uint64_t txg, hrtime_t birth_time);
 extern int spa_txg_history_set(spa_t *spa,  uint64_t txg,
@@ -842,7 +842,7 @@ extern void spa_history_log_internal_dd(dsl_dir_t *dd, const char *operation,
     dmu_tx_t *tx, const char *fmt, ...);
 
 /* error handling */
-struct zbookmark;
+struct zbookmark_phys;
 extern void spa_log_error(spa_t *spa, zio_t *zio);
 extern void zfs_ereport_post(const char *class, spa_t *spa, vdev_t *vd,
     zio_t *zio, uint64_t stateoroffset, uint64_t length);

diff --git a/include/sys/spa_impl.h b/include/sys/spa_impl.h
index a8ade1d217044a9e99408bd5f531f776a7f592aa..cd6aeef473f7642129c53e5df2fd9bc93eabfe2f 100644 (file)
--- a/include/sys/spa_impl.h
+++ b/include/sys/spa_impl.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  */
 
@@ -46,9 +46,9 @@ extern "C" {
 #endif
 
 typedef struct spa_error_entry {
-       zbookmark_t     se_bookmark;
-       char            *se_name;
-       avl_node_t      se_avl;
+       zbookmark_phys_t        se_bookmark;
+       char                    *se_name;
+       avl_node_t              se_avl;
 } spa_error_entry_t;
 
 typedef struct spa_history_phys {

diff --git a/include/sys/zio.h b/include/sys/zio.h
index 181722f6837db65d34eee3f40391fcca2cb93089..69b00d0f40296c8a3921d9e1ab6cc71e82de7d8f 100644 (file)
--- a/include/sys/zio.h
+++ b/include/sys/zio.h
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -263,11 +263,11 @@ extern const char *zio_type_name[ZIO_TYPES];
  * Note: this structure is called a bookmark because its original purpose
  * was to remember where to resume a pool-wide traverse.
  *
- * Note: this structure is passed between userland and the kernel.
- * Therefore it must not change size or alignment between 32/64 bit
- * compilation options.
+ * Note: this structure is passed between userland and the kernel, and is
+ * stored on disk (by virtue of being incorporated into other on-disk
+ * structures, e.g. dsl_scan_phys_t).
  */
-struct zbookmark {
+struct zbookmark_phys {
        uint64_t        zb_objset;
        uint64_t        zb_object;
        int64_t         zb_level;
@@ -383,7 +383,7 @@ typedef struct zio_link {
 
 struct zio {
        /* Core information about this I/O */
-       zbookmark_t     io_bookmark;
+       zbookmark_phys_t        io_bookmark;
        zio_prop_t      io_prop;
        zio_type_t      io_type;
        enum zio_child  io_child_type;
@@ -464,17 +464,17 @@ extern zio_t *zio_root(spa_t *spa,
 
 extern zio_t *zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, void *data,
     uint64_t size, zio_done_func_t *done, void *private,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_t *zb);
 
 extern zio_t *zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
     void *data, uint64_t size, const zio_prop_t *zp,
     zio_done_func_t *ready, zio_done_func_t *physdone, zio_done_func_t *done,
     void *private,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_t *zb);
 
 extern zio_t *zio_rewrite(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
     void *data, uint64_t size, zio_done_func_t *done, void *private,
-    zio_priority_t priority, enum zio_flag flags, zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, zbookmark_phys_t *zb);
 
 extern void zio_write_override(zio_t *zio, blkptr_t *bp, int copies,
     boolean_t nopwrite);
@@ -595,9 +595,9 @@ extern void zfs_ereport_post_checksum(spa_t *spa, vdev_t *vd,
 /* Called from spa_sync(), but primarily an injection handler */
 extern void spa_handle_ignored_writes(spa_t *spa);
 
-/* zbookmark functions */
+/* zbookmark_phys functions */
 boolean_t zbookmark_is_before(const struct dnode_phys *dnp,
-    const zbookmark_t *zb1, const zbookmark_t *zb2);
+    const zbookmark_phys_t *zb1, const zbookmark_phys_t *zb2);
 
 #ifdef __cplusplus
 }

diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index fce8fa96d2ceb798b0e09e2cd893bd99a0bc80cd..41d11ff556bc90f37dc661a34dd33314f2e5d928 100644 (file)
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <ctype.h>
@@ -3500,7 +3500,7 @@ zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv,
 static int
 zbookmark_compare(const void *a, const void *b)
 {
-       return (memcmp(a, b, sizeof (zbookmark_t)));
+       return (memcmp(a, b, sizeof (zbookmark_phys_t)));
 }
 
 /*
@@ -3512,7 +3512,7 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
 {
        zfs_cmd_t zc = {"\0"};
        uint64_t count;
-       zbookmark_t *zb = NULL;
+       zbookmark_phys_t *zb = NULL;
        int i;
 
        /*
@@ -3525,7 +3525,7 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
        if (count == 0)
                return (0);
        if ((zc.zc_nvlist_dst = (uintptr_t)zfs_alloc(zhp->zpool_hdl,
-           count * sizeof (zbookmark_t))) == (uintptr_t)NULL)
+           count * sizeof (zbookmark_phys_t))) == (uintptr_t)NULL)
                return (-1);
        zc.zc_nvlist_dst_size = count;
        (void) strcpy(zc.zc_name, zhp->zpool_name);
@@ -3534,11 +3534,14 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
                    &zc) != 0) {
                        free((void *)(uintptr_t)zc.zc_nvlist_dst);
                        if (errno == ENOMEM) {
+                               void *dst;
+
                                count = zc.zc_nvlist_dst_size;
-                               if ((zc.zc_nvlist_dst = (uintptr_t)
-                                   zfs_alloc(zhp->zpool_hdl, count *
-                                   sizeof (zbookmark_t))) == (uintptr_t)NULL)
+                               dst = zfs_alloc(zhp->zpool_hdl, count *
+                                   sizeof (zbookmark_phys_t));
+                               if (dst == NULL)
                                        return (-1);
+                               zc.zc_nvlist_dst = (uintptr_t)dst;
                        } else {
                                return (-1);
                        }
@@ -3554,11 +3557,11 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
         * _not_ copied as part of the process.  So we point the start of our
         * array appropriate and decrement the total number of elements.
         */
-       zb = ((zbookmark_t *)(uintptr_t)zc.zc_nvlist_dst) +
+       zb = ((zbookmark_phys_t *)(uintptr_t)zc.zc_nvlist_dst) +
            zc.zc_nvlist_dst_size;
        count -= zc.zc_nvlist_dst_size;
 
-       qsort(zb, count, sizeof (zbookmark_t), zbookmark_compare);
+       qsort(zb, count, sizeof (zbookmark_phys_t), zbookmark_compare);
 
        verify(nvlist_alloc(nverrlistp, 0, KM_SLEEP) == 0);
 

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index ad29237b971ada15e66cd2ffde80a57aa61de4a6..27b004132a6cfc4217c6e398c1513d9dd84d4c4d 100644 (file)
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
@@ -731,7 +731,7 @@ typedef struct l2arc_read_callback {
        arc_buf_t               *l2rcb_buf;             /* read buffer */
        spa_t                   *l2rcb_spa;             /* spa */
        blkptr_t                l2rcb_bp;               /* original blkptr */
-       zbookmark_t             l2rcb_zb;               /* original bookmark */
+       zbookmark_phys_t        l2rcb_zb;               /* original bookmark */
        int                     l2rcb_flags;            /* original flags */
        enum zio_compress       l2rcb_compress;         /* applied compress */
 } l2arc_read_callback_t;
@@ -3197,7 +3197,7 @@ arc_read_done(zio_t *zio)
 int
 arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
     void *private, zio_priority_t priority, int zio_flags, uint32_t *arc_flags,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
        arc_buf_hdr_t *hdr = NULL;
        arc_buf_t *buf = NULL;
@@ -3392,7 +3392,7 @@ top:
                 */
                ASSERT3U(hdr->b_size, ==, size);
                DTRACE_PROBE4(arc__miss, arc_buf_hdr_t *, hdr, blkptr_t *, bp,
-                   uint64_t, size, zbookmark_t *, zb);
+                   uint64_t, size, zbookmark_phys_t *, zb);
                ARCSTAT_BUMP(arcstat_misses);
                ARCSTAT_CONDSTAT(!(hdr->b_flags & ARC_PREFETCH),
                    demand, prefetch, hdr->b_type != ARC_BUFC_METADATA,
@@ -3963,7 +3963,7 @@ arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
     blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc, boolean_t l2arc_compress,
     const zio_prop_t *zp, arc_done_func_t *ready, arc_done_func_t *physdone,
     arc_done_func_t *done, void *private, zio_priority_t priority,
-    int zio_flags, const zbookmark_t *zb)
+    int zio_flags, const zbookmark_phys_t *zb)
 {
        arc_buf_hdr_t *hdr = buf->b_hdr;
        arc_write_callback_t *callback;

diff --git a/module/zfs/bptree.c b/module/zfs/bptree.c
index cbe8d1caaed4ec667608263eccdbbb5fed428764..61fa17f6ee9f7bd951cdaa99c9a7ea4b5efb62a2 100644 (file)
--- a/module/zfs/bptree.c
+++ b/module/zfs/bptree.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/arc.h>
@@ -151,7 +151,7 @@ bptree_add(objset_t *os, uint64_t obj, blkptr_t *bp, uint64_t birth_txg,
 /* ARGSUSED */
 static int
 bptree_visit_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        int err;
        struct bptree_args *ba = arg;

diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c
index 1e5fac78eedca7893a8f9b9bfa5b589ffad1ac92..2b412f1a73c4d3f5819118b7f39881ab26d9402c 100644 (file)
--- a/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
@@ -577,7 +577,7 @@ static void
 dbuf_read_impl(dmu_buf_impl_t *db, zio_t *zio, uint32_t *flags)
 {
        dnode_t *dn;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        uint32_t aflags = ARC_NOWAIT;
 
        DB_DNODE_ENTER(db);
@@ -1922,7 +1922,7 @@ dbuf_prefetch(dnode_t *dn, uint64_t blkid, zio_priority_t prio)
                if (bp && !BP_IS_HOLE(bp) && !BP_IS_EMBEDDED(bp)) {
                        dsl_dataset_t *ds = dn->dn_objset->os_dsl_dataset;
                        uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
-                       zbookmark_t zb;
+                       zbookmark_phys_t zb;
 
                        SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
                            dn->dn_object, 0, blkid);
@@ -2845,7 +2845,7 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
        objset_t *os;
        dmu_buf_impl_t *parent = db->db_parent;
        uint64_t txg = tx->tx_txg;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        zio_prop_t zp;
        zio_t *zio;
        int wp_flag = 0;

diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
index 305973abf7adce44daa9b345f94e2f513a87e376..a6fe4fb3dcec350a25b390296196e384fe5d57a5 100644 (file)
--- a/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -1509,7 +1509,7 @@ dmu_sync_late_arrival_done(zio_t *zio)
 
 static int
 dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
-    zio_prop_t *zp, zbookmark_t *zb)
+    zio_prop_t *zp, zbookmark_phys_t *zb)
 {
        dmu_sync_arg_t *dsa;
        dmu_tx_t *tx;
@@ -1570,7 +1570,7 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
        dsl_dataset_t *ds = os->os_dsl_dataset;
        dbuf_dirty_record_t *dr;
        dmu_sync_arg_t *dsa;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        zio_prop_t zp;
        dnode_t *dn;
 

diff --git a/module/zfs/dmu_diff.c b/module/zfs/dmu_diff.c
index a2130b1319b57015c07e3e9f37096d5f17f87bdf..30fabbb07957f9566d620e2a1bd8d64430fdb1d2 100644 (file)
--- a/module/zfs/dmu_diff.c
+++ b/module/zfs/dmu_diff.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -107,7 +107,7 @@ report_dnode(struct diffarg *da, uint64_t object, dnode_phys_t *dnp)
 /* ARGSUSED */
 static int
 diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        struct diffarg *da = arg;
        int err = 0;

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index 238892cf40631c291bc450b9ec6ce87010669569..7876d759079393151325bbc819640eb2ecb4e230 100644 (file)
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -285,7 +285,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
        os->os_rootbp = bp;
        if (!BP_IS_HOLE(os->os_rootbp)) {
                uint32_t aflags = ARC_WAIT;
-               zbookmark_t zb;
+               zbookmark_phys_t zb;
                SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
                    ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
 
@@ -1018,7 +1018,7 @@ void
 dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
 {
        int txgoff;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        zio_prop_t zp;
        zio_t *zio;
        list_t *list;

diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
index 39f282ce662a3830468e30ef5e17199cc2a6a2c1..6f7910362de8ea6083e82c6d1fcd4db13e3e85ec 100644 (file)
--- a/module/zfs/dmu_send.c
+++ b/module/zfs/dmu_send.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -449,7 +449,7 @@ backup_do_embed(dmu_sendarg_t *dsp, const blkptr_t *bp)
 /* ARGSUSED */
 static int
 backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        dmu_sendarg_t *dsp = arg;
        dmu_object_type_t type = bp ? BP_GET_TYPE(bp) : DMU_OT_NONE;

diff --git a/module/zfs/dmu_traverse.c b/module/zfs/dmu_traverse.c
index 77843f4388ccff2ce6aa25654084169d8316b08f..42dde79033045d7910318565d3c3db0087cea5c8 100644 (file)
--- a/module/zfs/dmu_traverse.c
+++ b/module/zfs/dmu_traverse.c
@@ -55,7 +55,7 @@ typedef struct traverse_data {
        uint64_t td_objset;
        blkptr_t *td_rootbp;
        uint64_t td_min_txg;
-       zbookmark_t *td_resume;
+       zbookmark_phys_t *td_resume;
        int td_flags;
        prefetch_data_t *td_pfd;
        boolean_t td_paused;
@@ -72,7 +72,7 @@ static int
 traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
 {
        traverse_data_t *td = arg;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
 
        if (BP_IS_HOLE(bp))
                return (0);
@@ -96,7 +96,7 @@ traverse_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
        if (lrc->lrc_txtype == TX_WRITE) {
                lr_write_t *lr = (lr_write_t *)lrc;
                blkptr_t *bp = &lr->lr_blkptr;
-               zbookmark_t zb;
+               zbookmark_phys_t zb;
 
                if (BP_IS_HOLE(bp))
                        return (0);
@@ -150,7 +150,7 @@ typedef enum resume_skip {
  */
 static resume_skip_t
 resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
        if (td->td_resume != NULL && !ZB_IS_ZERO(td->td_resume)) {
                /*
@@ -175,7 +175,7 @@ resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
 
 static void
 traverse_prefetch_metadata(traverse_data_t *td,
-    const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
        uint32_t flags = ARC_NOWAIT | ARC_PREFETCH;
 
@@ -209,7 +209,7 @@ prefetch_needed(prefetch_data_t *pfd, const blkptr_t *bp)
 
 static int
 traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
-    const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
        int err = 0;
        arc_buf_t *buf = NULL;
@@ -281,14 +281,14 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                uint32_t flags = ARC_WAIT;
                int32_t i;
                int32_t epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT;
-               zbookmark_t *czb;
+               zbookmark_phys_t *czb;
 
                err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
                if (err != 0)
                        goto post;
 
-               czb = kmem_alloc(sizeof (zbookmark_t), KM_PUSHPAGE);
+               czb = kmem_alloc(sizeof (zbookmark_phys_t), KM_PUSHPAGE);
 
                for (i = 0; i < epb; i++) {
                        SET_BOOKMARK(czb, zb->zb_objset, zb->zb_object,
@@ -309,7 +309,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                                break;
                }
 
-               kmem_free(czb, sizeof (zbookmark_t));
+               kmem_free(czb, sizeof (zbookmark_phys_t));
 
        } else if (BP_GET_TYPE(bp) == DMU_OT_DNODE) {
                uint32_t flags = ARC_WAIT;
@@ -411,7 +411,7 @@ prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *dnp,
     uint64_t objset, uint64_t object)
 {
        int j;
-       zbookmark_t czb;
+       zbookmark_phys_t czb;
 
        for (j = 0; j < dnp->dn_nblkptr; j++) {
                SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
@@ -429,7 +429,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
     uint64_t objset, uint64_t object)
 {
        int j, err = 0;
-       zbookmark_t czb;
+       zbookmark_phys_t czb;
 
        for (j = 0; j < dnp->dn_nblkptr; j++) {
                SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
@@ -448,7 +448,7 @@ traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
 /* ARGSUSED */
 static int
 traverse_prefetcher(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        prefetch_data_t *pfd = arg;
        uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
@@ -478,7 +478,7 @@ traverse_prefetch_thread(void *arg)
 {
        traverse_data_t *td_main = arg;
        traverse_data_t td = *td_main;
-       zbookmark_t czb;
+       zbookmark_phys_t czb;
 
        td.td_func = traverse_prefetcher;
        td.td_arg = td_main->td_pfd;
@@ -500,12 +500,12 @@ traverse_prefetch_thread(void *arg)
  */
 static int
 traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg)
 {
        traverse_data_t *td;
        prefetch_data_t *pd;
-       zbookmark_t *czb;
+       zbookmark_phys_t *czb;
        int err;
 
        ASSERT(ds == NULL || objset == ds->ds_object);
@@ -519,7 +519,7 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
 
        td = kmem_alloc(sizeof (traverse_data_t), KM_PUSHPAGE);
        pd = kmem_zalloc(sizeof (prefetch_data_t), KM_PUSHPAGE);
-       czb = kmem_alloc(sizeof (zbookmark_t), KM_PUSHPAGE);
+       czb = kmem_alloc(sizeof (zbookmark_phys_t), KM_PUSHPAGE);
 
        td->td_spa = spa;
        td->td_objset = objset;
@@ -574,7 +574,7 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
        mutex_destroy(&pd->pd_mtx);
        cv_destroy(&pd->pd_cv);
 
-       kmem_free(czb, sizeof (zbookmark_t));
+       kmem_free(czb, sizeof (zbookmark_phys_t));
        kmem_free(pd, sizeof (struct prefetch_data));
        kmem_free(td, sizeof (struct traverse_data));
 
@@ -595,7 +595,7 @@ traverse_dataset(dsl_dataset_t *ds, uint64_t txg_start, int flags,
 
 int
 traverse_dataset_destroyed(spa_t *spa, blkptr_t *blkptr,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg)
 {
        return (traverse_impl(spa, NULL, ZB_DESTROYED_OBJSET,

diff --git a/module/zfs/dsl_destroy.c b/module/zfs/dsl_destroy.c
index dc49fd558c3caa7a5143005d4a6292105e1640a7..50a9c5f31b1f8e1d8d0383ec66d98e2de26aaf71 100644 (file)
--- a/module/zfs/dsl_destroy.c
+++ b/module/zfs/dsl_destroy.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -541,7 +541,7 @@ struct killarg {
 /* ARGSUSED */
 static int
 kill_blkptr(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        struct killarg *ka = arg;
        dmu_tx_t *tx = ka->tx;

diff --git a/module/zfs/dsl_scan.c b/module/zfs/dsl_scan.c
index 0f0243b310a01df1599dee45d2e2e4b7334b7ceb..f22be9889188f9f42dea1c368d282fbb828b482b 100644 (file)
--- a/module/zfs/dsl_scan.c
+++ b/module/zfs/dsl_scan.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dsl_scan.h>
@@ -50,7 +50,8 @@
 #include <sys/zfs_vfsops.h>
 #endif
 
-typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *, const zbookmark_t *);
+typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *,
+    const zbookmark_phys_t *);
 
 static scan_cb_t dsl_scan_scrub_cb;
 static void dsl_scan_cancel_sync(void *, dmu_tx_t *);
@@ -389,7 +390,7 @@ dsl_scan_cancel(dsl_pool_t *dp)
 }
 
 static void dsl_scan_visitbp(blkptr_t *bp,
-    const zbookmark_t *zb, dnode_phys_t *dnp, arc_buf_t *pbuf,
+    const zbookmark_phys_t *zb, dnode_phys_t *dnp, arc_buf_t *pbuf,
     dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype,
     dmu_tx_t *tx);
 inline __attribute__((always_inline)) static void dsl_scan_visitdnode(
@@ -428,7 +429,7 @@ dsl_scan_sync_state(dsl_scan_t *scn, dmu_tx_t *tx)
 }
 
 static boolean_t
-dsl_scan_check_pause(dsl_scan_t *scn, const zbookmark_t *zb)
+dsl_scan_check_pause(dsl_scan_t *scn, const zbookmark_phys_t *zb)
 {
        uint64_t elapsed_nanosecs;
        int mintime;
@@ -486,7 +487,7 @@ dsl_scan_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
        dsl_pool_t *dp = zsa->zsa_dp;
        dsl_scan_t *scn = dp->dp_scan;
        zil_header_t *zh = zsa->zsa_zh;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
 
        if (BP_IS_HOLE(bp) || bp->blk_birth <= scn->scn_phys.scn_cur_min_txg)
                return (0);
@@ -518,7 +519,7 @@ dsl_scan_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
                zil_header_t *zh = zsa->zsa_zh;
                lr_write_t *lr = (lr_write_t *)lrc;
                blkptr_t *bp = &lr->lr_blkptr;
-               zbookmark_t zb;
+               zbookmark_phys_t zb;
 
                if (BP_IS_HOLE(bp) ||
                    bp->blk_birth <= scn->scn_phys.scn_cur_min_txg)
@@ -568,7 +569,7 @@ static void
 dsl_scan_prefetch(dsl_scan_t *scn, arc_buf_t *buf, blkptr_t *bp,
     uint64_t objset, uint64_t object, uint64_t blkid)
 {
-       zbookmark_t czb;
+       zbookmark_phys_t czb;
        uint32_t flags = ARC_NOWAIT | ARC_PREFETCH;
 
        if (zfs_no_scrub_prefetch)
@@ -587,7 +588,7 @@ dsl_scan_prefetch(dsl_scan_t *scn, arc_buf_t *buf, blkptr_t *bp,
 
 static boolean_t
 dsl_scan_check_resume(dsl_scan_t *scn, const dnode_phys_t *dnp,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
        /*
         * We never skip over user/group accounting objects (obj<0)
@@ -627,7 +628,7 @@ dsl_scan_check_resume(dsl_scan_t *scn, const dnode_phys_t *dnp,
 inline __attribute__((always_inline)) static int
 dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype,
     dnode_phys_t *dnp, const blkptr_t *bp,
-    const zbookmark_t *zb, dmu_tx_t *tx, arc_buf_t **bufp)
+    const zbookmark_phys_t *zb, dmu_tx_t *tx, arc_buf_t **bufp)
 {
        dsl_pool_t *dp = scn->scn_dp;
        int zio_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCAN_THREAD;
@@ -650,7 +651,7 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype,
                            zb->zb_object, zb->zb_blkid * epb + i);
                }
                for (i = 0, cbp = (*bufp)->b_data; i < epb; i++, cbp++) {
-                       zbookmark_t czb;
+                       zbookmark_phys_t czb;
 
                        SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
                            zb->zb_level - 1,
@@ -734,7 +735,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
        int j;
 
        for (j = 0; j < dnp->dn_nblkptr; j++) {
-               zbookmark_t czb;
+               zbookmark_phys_t czb;
 
                SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object,
                    dnp->dn_nlevels - 1, j);
@@ -743,7 +744,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
        }
 
        if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
-               zbookmark_t czb;
+               zbookmark_phys_t czb;
                SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object,
                    0, DMU_SPILL_BLKID);
                dsl_scan_visitbp(&dnp->dn_spill,
@@ -756,7 +757,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
  * first 5; we want them to be useful.
  */
 static void
-dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
+dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb,
     dnode_phys_t *dnp, arc_buf_t *pbuf,
     dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype,
     dmu_tx_t *tx)
@@ -832,7 +833,7 @@ static void
 dsl_scan_visit_rootbp(dsl_scan_t *scn, dsl_dataset_t *ds, blkptr_t *bp,
     dmu_tx_t *tx)
 {
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
 
        SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
            ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
@@ -1262,7 +1263,7 @@ dsl_scan_ddt_entry(dsl_scan_t *scn, enum zio_checksum checksum,
        const ddt_key_t *ddk = &dde->dde_key;
        ddt_phys_t *ddp = dde->dde_phys;
        blkptr_t bp;
-       zbookmark_t zb = { 0 };
+       zbookmark_phys_t zb = { 0 };
        int p;
 
        if (scn->scn_phys.scn_state != DSS_SCANNING)
@@ -1331,7 +1332,7 @@ dsl_scan_visit(dsl_scan_t *scn, dmu_tx_t *tx)
         * In case we were paused right at the end of the ds, zero the
         * bookmark so we don't think that we're still trying to resume.
         */
-       bzero(&scn->scn_phys.scn_bookmark, sizeof (zbookmark_t));
+       bzero(&scn->scn_phys.scn_bookmark, sizeof (zbookmark_phys_t));
        zc = kmem_alloc(sizeof (zap_cursor_t), KM_PUSHPAGE);
        za = kmem_alloc(sizeof (zap_attribute_t), KM_PUSHPAGE);
 
@@ -1735,7 +1736,7 @@ dsl_scan_scrub_done(zio_t *zio)
 
 static int
 dsl_scan_scrub_cb(dsl_pool_t *dp,
-    const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
        dsl_scan_t *scn = dp->dp_scan;
        size_t size = BP_GET_PSIZE(bp);

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index e4b71ea72d4f51b9d8f9dfa0e703f2e9833cedd4..7bd254aa554d1e4d59c1d1f9cb5e2eccd0c293ba 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -790,7 +790,7 @@ spa_error_entry_compare(const void *a, const void *b)
        int ret;
 
        ret = bcmp(&sa->se_bookmark, &sb->se_bookmark,
-           sizeof (zbookmark_t));
+           sizeof (zbookmark_phys_t));
 
        if (ret < 0)
                return (-1);
@@ -1876,7 +1876,7 @@ spa_load_verify_done(zio_t *zio)
 /*ARGSUSED*/
 static int
 spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        if (!BP_IS_HOLE(bp) && !BP_IS_EMBEDDED(bp)) {
                zio_t *rio = arg;

diff --git a/module/zfs/spa_errlog.c b/module/zfs/spa_errlog.c
index 35853e2825503a6a8930641053893bb4ab151a13..925e2af604026c1f50be4661f865eacfedc56ee0 100644 (file)
--- a/module/zfs/spa_errlog.c
+++ b/module/zfs/spa_errlog.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -35,7 +35,7 @@
  * deleted from the log when the scrub completes.
  *
  * The log is stored using a ZAP object whose key is a string form of the
- * zbookmark tuple (objset, object, level, blkid), and whose contents is an
+ * zbookmark_phys tuple (objset, object, level, blkid), and whose contents is an
  * optional 'objset:object' human-readable string describing the data.  When an
  * error is first logged, this string will be empty, indicating that no name is
  * known.  This prevents us from having to issue a potentially large amount of
@@ -59,7 +59,7 @@
  * Convert a bookmark to a string.
  */
 static void
-bookmark_to_name(zbookmark_t *zb, char *buf, size_t len)
+bookmark_to_name(zbookmark_phys_t *zb, char *buf, size_t len)
 {
        (void) snprintf(buf, len, "%llx:%llx:%llx:%llx",
            (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object,
@@ -71,7 +71,7 @@ bookmark_to_name(zbookmark_t *zb, char *buf, size_t len)
  */
 #ifdef _KERNEL
 static void
-name_to_bookmark(char *buf, zbookmark_t *zb)
+name_to_bookmark(char *buf, zbookmark_phys_t *zb)
 {
        zb->zb_objset = strtonum(buf, &buf);
        ASSERT(*buf == ':');
@@ -92,7 +92,7 @@ name_to_bookmark(char *buf, zbookmark_t *zb)
 void
 spa_log_error(spa_t *spa, zio_t *zio)
 {
-       zbookmark_t *zb = &zio->io_logical->io_bookmark;
+       zbookmark_phys_t *zb = &zio->io_logical->io_bookmark;
        spa_error_entry_t search;
        spa_error_entry_t *new;
        avl_tree_t *tree;
@@ -165,7 +165,7 @@ process_error_log(spa_t *spa, uint64_t obj, void *addr, size_t *count)
 {
        zap_cursor_t zc;
        zap_attribute_t za;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
 
        if (obj == 0)
                return (0);
@@ -182,8 +182,8 @@ process_error_log(spa_t *spa, uint64_t obj, void *addr, size_t *count)
                name_to_bookmark(za.za_name, &zb);
 
                if (copyout(&zb, (char *)addr +
-                   (*count - 1) * sizeof (zbookmark_t),
-                   sizeof (zbookmark_t)) != 0) {
+                   (*count - 1) * sizeof (zbookmark_phys_t),
+                   sizeof (zbookmark_phys_t)) != 0) {
                        zap_cursor_fini(&zc);
                        return (SET_ERROR(EFAULT));
                }
@@ -207,8 +207,8 @@ process_error_list(avl_tree_t *list, void *addr, size_t *count)
                        return (SET_ERROR(ENOMEM));
 
                if (copyout(&se->se_bookmark, (char *)addr +
-                   (*count - 1) * sizeof (zbookmark_t),
-                   sizeof (zbookmark_t)) != 0)
+                   (*count - 1) * sizeof (zbookmark_phys_t),
+                   sizeof (zbookmark_phys_t)) != 0)
                        return (SET_ERROR(EFAULT));
 
                *count -= 1;

diff --git a/module/zfs/spa_stats.c b/module/zfs/spa_stats.c
index dbc761e115d5a7fea577011600ad6a119244a790..2ae0af20e71476d1a17c4d26961b27c3ef82ff8c 100644 (file)
--- a/module/zfs/spa_stats.c
+++ b/module/zfs/spa_stats.c
@@ -192,7 +192,7 @@ spa_read_history_destroy(spa_t *spa)
 }
 
 void
-spa_read_history_add(spa_t *spa, const zbookmark_t *zb, uint32_t aflags)
+spa_read_history_add(spa_t *spa, const zbookmark_phys_t *zb, uint32_t aflags)
 {
        spa_stats_history_t *ssh = &spa->spa_stats.read_history;
        spa_read_history_t *srh, *rm;

diff --git a/module/zfs/zil.c b/module/zfs/zil.c
index 7c3c6592b51f59a007546271356b9242a0058f47..e625bb9967d5fc7f64362a08705090f2ad339d93 100644 (file)
--- a/module/zfs/zil.c
+++ b/module/zfs/zil.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -205,7 +205,7 @@ zil_read_log_block(zilog_t *zilog, const blkptr_t *bp, blkptr_t *nbp, void *dst,
        enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
        uint32_t aflags = ARC_WAIT;
        arc_buf_t *abuf = NULL;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        int error;
 
        if (zilog->zl_header->zh_claim_txg == 0)
@@ -278,7 +278,7 @@ zil_read_log_data(zilog_t *zilog, const lr_write_t *lr, void *wbuf)
        const blkptr_t *bp = &lr->lr_blkptr;
        uint32_t aflags = ARC_WAIT;
        arc_buf_t *abuf = NULL;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
        int error;
 
        if (BP_IS_HOLE(bp)) {
@@ -900,7 +900,7 @@ zil_lwb_write_done(zio_t *zio)
 static void
 zil_lwb_write_init(zilog_t *zilog, lwb_t *lwb)
 {
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
 
        SET_BOOKMARK(&zb, lwb->lwb_blk.blk_cksum.zc_word[ZIL_ZC_OBJSET],
            ZB_ZIL_OBJECT, ZB_ZIL_LEVEL,

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 58d4550fbf79be4f75df3816dd52988f467cba1d..e4f1271d3a02733bb5712705446a47d543e0ae80 100644 (file)
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -539,7 +539,7 @@ static zio_t *
 zio_create(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
     void *data, uint64_t size, zio_done_func_t *done, void *private,
     zio_type_t type, zio_priority_t priority, enum zio_flag flags,
-    vdev_t *vd, uint64_t offset, const zbookmark_t *zb,
+    vdev_t *vd, uint64_t offset, const zbookmark_phys_t *zb,
     enum zio_stage stage, enum zio_stage pipeline)
 {
        zio_t *zio;
@@ -623,7 +623,7 @@ zio_create(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
        bzero(zio->io_child_error, sizeof (int) * ZIO_CHILD_TYPES);
        bzero(zio->io_children,
            sizeof (uint64_t) * ZIO_CHILD_TYPES * ZIO_WAIT_TYPES);
-       bzero(&zio->io_bookmark, sizeof (zbookmark_t));
+       bzero(&zio->io_bookmark, sizeof (zbookmark_phys_t));
 
        zio->io_state[ZIO_WAIT_READY] = (stage >= ZIO_STAGE_READY);
        zio->io_state[ZIO_WAIT_DONE] = (stage >= ZIO_STAGE_DONE);
@@ -672,7 +672,7 @@ zio_root(spa_t *spa, zio_done_func_t *done, void *private, enum zio_flag flags)
 zio_t *
 zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
     void *data, uint64_t size, zio_done_func_t *done, void *private,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_t *zb)
 {
        zio_t *zio;
 
@@ -690,7 +690,7 @@ zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
     void *data, uint64_t size, const zio_prop_t *zp,
     zio_done_func_t *ready, zio_done_func_t *physdone, zio_done_func_t *done,
     void *private,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_t *zb)
 {
        zio_t *zio;
 
@@ -728,7 +728,7 @@ zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
 zio_t *
 zio_rewrite(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp, void *data,
     uint64_t size, zio_done_func_t *done, void *private,
-    zio_priority_t priority, enum zio_flag flags, zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, zbookmark_phys_t *zb)
 {
        zio_t *zio;
 
@@ -3348,8 +3348,8 @@ static zio_pipe_stage_t *zio_pipeline[] = {
 
 /* dnp is the dnode for zb1->zb_object */
 boolean_t
-zbookmark_is_before(const dnode_phys_t *dnp, const zbookmark_t *zb1,
-    const zbookmark_t *zb2)
+zbookmark_is_before(const dnode_phys_t *dnp, const zbookmark_phys_t *zb1,
+    const zbookmark_phys_t *zb2)
 {
        uint64_t zb1nextL0, zb2thisobj;
 

diff --git a/module/zfs/zio_inject.c b/module/zfs/zio_inject.c
index 13d188731c68aa5b96adca6a399e10c0b440ae79..c168f3b47f2e1fdf493ab33b7e6bb42de4486d7a 100644 (file)
--- a/module/zfs/zio_inject.c
+++ b/module/zfs/zio_inject.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -64,7 +64,7 @@ static int inject_next_id = 1;
  * Returns true if the given record matches the I/O in progress.
  */
 static boolean_t
-zio_match_handler(zbookmark_t *zb, uint64_t type,
+zio_match_handler(zbookmark_phys_t *zb, uint64_t type,
     zinject_record_t *record, int error)
 {
        /*