zfs list: Allow more fields in ZFS_ITER_SIMPLE mode

If the fields to be listed and sorted by are constrained
to those populated by dsl_dataset_fast_stat(), then
zfs list is much faster, as it does not need to open each
objset and reads its properties.

A previous optimization by Pawel Dawidek
(0cee24064a79f9c01fc4521543c37acea538405f) took advantage
of this to make listing snapshot names sorted only by name
much faster.

However, it was limited to `-o name -s name`, this work
extends this optimization to work with:
  - name
  - guid
  - createtxg
  - numclones
  - inconsistent
  - redacted
  - origin
and could be further extended to any other properties
supported by dsl_dataset_fast_stat() or similar, that do
not require extra locking or reading from disk.

Reviewed-by: Mark Maybee <mark.maybee@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Pawel Jakub Dawidek <pawel@dawidek.net>
Signed-off-by: Allan Jude <allan@klarasystems.com>
Closes #11080

diff --git a/cmd/zfs/zfs_iter.c b/cmd/zfs/zfs_iter.c
index f2359508c16d6f8338c12910e44c80e20fc2490c..301a179a2b083fef38d8e76e8cf245462c01a9a8 100644 (file)
--- a/cmd/zfs/zfs_iter.c
+++ b/cmd/zfs/zfs_iter.c
@@ -144,19 +144,20 @@ zfs_callback(zfs_handle_t *zhp, void *data)
                    (cb->cb_types &
                    (ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME))) &&
                    zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) {
-                       (void) zfs_iter_filesystems(zhp, zfs_callback, data);
+                       (void) zfs_iter_filesystems(zhp, cb->cb_flags,
+                           zfs_callback, data);
                }
 
                if (((zfs_get_type(zhp) & (ZFS_TYPE_SNAPSHOT |
                    ZFS_TYPE_BOOKMARK)) == 0) && include_snaps) {
-                       (void) zfs_iter_snapshots(zhp,
-                           (cb->cb_flags & ZFS_ITER_SIMPLE) != 0,
+                       (void) zfs_iter_snapshots(zhp, cb->cb_flags,
                            zfs_callback, data, 0, 0);
                }
 
                if (((zfs_get_type(zhp) & (ZFS_TYPE_SNAPSHOT |
                    ZFS_TYPE_BOOKMARK)) == 0) && include_bmarks) {
-                       (void) zfs_iter_bookmarks(zhp, zfs_callback, data);
+                       (void) zfs_iter_bookmarks(zhp, cb->cb_flags,
+                           zfs_callback, data);
                }
 
                cb->cb_depth--;
@@ -212,11 +213,58 @@ zfs_free_sort_columns(zfs_sort_column_t *sc)
        }
 }
 
-int
-zfs_sort_only_by_name(const zfs_sort_column_t *sc)
+/*
+ * Return true if all of the properties to be sorted are populated by
+ * dsl_dataset_fast_stat(). Note that sc == NULL (no sort) means we
+ * don't need any extra properties, so returns true.
+ */
+boolean_t
+zfs_sort_only_by_fast(const zfs_sort_column_t *sc)
 {
-       return (sc != NULL && sc->sc_next == NULL &&
-           sc->sc_prop == ZFS_PROP_NAME);
+       while (sc != NULL) {
+               switch (sc->sc_prop) {
+               case ZFS_PROP_NAME:
+               case ZFS_PROP_GUID:
+               case ZFS_PROP_CREATETXG:
+               case ZFS_PROP_NUMCLONES:
+               case ZFS_PROP_INCONSISTENT:
+               case ZFS_PROP_REDACTED:
+               case ZFS_PROP_ORIGIN:
+                       break;
+               default:
+                       return (B_FALSE);
+               }
+               sc = sc->sc_next;
+       }
+
+       return (B_TRUE);
+}
+
+boolean_t
+zfs_list_only_by_fast(const zprop_list_t *p)
+{
+       if (p == NULL) {
+               /* NULL means 'all' so we can't use simple mode */
+               return (B_FALSE);
+       }
+
+       while (p != NULL) {
+               switch (p->pl_prop) {
+               case ZFS_PROP_NAME:
+               case ZFS_PROP_GUID:
+               case ZFS_PROP_CREATETXG:
+               case ZFS_PROP_NUMCLONES:
+               case ZFS_PROP_INCONSISTENT:
+               case ZFS_PROP_REDACTED:
+               case ZFS_PROP_ORIGIN:
+                       break;
+               default:
+                       return (B_FALSE);
+               }
+               p = p->pl_next;
+       }
+
+       return (B_TRUE);
 }
 
 /* ARGSUSED */

diff --git a/cmd/zfs/zfs_iter.h b/cmd/zfs/zfs_iter.h
index 2697fbdca1df1f6790edf1c845be296c5f7419b9..d93d7e322a520453712015f14aab5df66bcb0da5 100644 (file)
--- a/cmd/zfs/zfs_iter.h
+++ b/cmd/zfs/zfs_iter.h
@@ -40,19 +40,13 @@ typedef struct zfs_sort_column {
        boolean_t               sc_reverse;
 } zfs_sort_column_t;
 
-#define        ZFS_ITER_RECURSE           (1 << 0)
-#define        ZFS_ITER_ARGS_CAN_BE_PATHS (1 << 1)
-#define        ZFS_ITER_PROP_LISTSNAPS    (1 << 2)
-#define        ZFS_ITER_DEPTH_LIMIT       (1 << 3)
-#define        ZFS_ITER_RECVD_PROPS       (1 << 4)
-#define        ZFS_ITER_LITERAL_PROPS     (1 << 5)
-#define        ZFS_ITER_SIMPLE            (1 << 6)
-
 int zfs_for_each(int, char **, int options, zfs_type_t,
     zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *);
 int zfs_add_sort_column(zfs_sort_column_t **, const char *, boolean_t);
 void zfs_free_sort_columns(zfs_sort_column_t *);
-int zfs_sort_only_by_name(const zfs_sort_column_t *);
+boolean_t zfs_sort_only_by_fast(const zfs_sort_column_t *);
+boolean_t zfs_list_only_by_fast(const zprop_list_t *);
+
 
 #ifdef __cplusplus
 }

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index 5aa2508c382fb1847ad00c4c965478359ffd69ad..0ac0711bb0d520de501d05dd2729abba34157e98 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -1536,7 +1536,7 @@ destroy_print_snapshots(zfs_handle_t *fs_zhp, destroy_cbdata_t *cb)
        int err;
        assert(cb->cb_firstsnap == NULL);
        assert(cb->cb_prevsnap == NULL);
-       err = zfs_iter_snapshots_sorted(fs_zhp, destroy_print_cb, cb, 0, 0);
+       err = zfs_iter_snapshots_sorted(fs_zhp, 0, destroy_print_cb, cb, 0, 0);
        if (cb->cb_firstsnap != NULL) {
                uint64_t used = 0;
                if (err == 0) {
@@ -1562,7 +1562,7 @@ snapshot_to_nvl_cb(zfs_handle_t *zhp, void *arg)
        if (!cb->cb_doclones && !cb->cb_defer_destroy) {
                cb->cb_target = zhp;
                cb->cb_first = B_TRUE;
-               err = zfs_iter_dependents(zhp, B_TRUE,
+               err = zfs_iter_dependents(zhp, 0, B_TRUE,
                    destroy_check_dependent, cb);
        }
 
@@ -1580,7 +1580,8 @@ gather_snapshots(zfs_handle_t *zhp, void *arg)
        destroy_cbdata_t *cb = arg;
        int err = 0;
 
-       err = zfs_iter_snapspec(zhp, cb->cb_snapspec, snapshot_to_nvl_cb, cb);
+       err = zfs_iter_snapspec(zhp, 0, cb->cb_snapspec,
+           snapshot_to_nvl_cb, cb);
        if (err == ENOENT)
                err = 0;
        if (err != 0)
@@ -1593,7 +1594,7 @@ gather_snapshots(zfs_handle_t *zhp, void *arg)
        }
 
        if (cb->cb_recurse)
-               err = zfs_iter_filesystems(zhp, gather_snapshots, cb);
+               err = zfs_iter_filesystems(zhp, 0, gather_snapshots, cb);
 
 out:
        zfs_close(zhp);
@@ -1618,7 +1619,7 @@ destroy_clones(destroy_cbdata_t *cb)
                         * false while destroying the clones.
                         */
                        cb->cb_defer_destroy = B_FALSE;
-                       err = zfs_iter_dependents(zhp, B_FALSE,
+                       err = zfs_iter_dependents(zhp, 0, B_FALSE,
                            destroy_callback, cb);
                        cb->cb_defer_destroy = defer;
                        zfs_close(zhp);
@@ -1829,7 +1830,7 @@ zfs_do_destroy(int argc, char **argv)
                 */
                cb.cb_first = B_TRUE;
                if (!cb.cb_doclones &&
-                   zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent,
+                   zfs_iter_dependents(zhp, 0, B_TRUE, destroy_check_dependent,
                    &cb) != 0) {
                        rv = 1;
                        goto out;
@@ -1840,7 +1841,7 @@ zfs_do_destroy(int argc, char **argv)
                        goto out;
                }
                cb.cb_batchedsnaps = fnvlist_alloc();
-               if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback,
+               if (zfs_iter_dependents(zhp, 0, B_FALSE, destroy_callback,
                    &cb) != 0) {
                        rv = 1;
                        goto out;
@@ -3704,13 +3705,6 @@ zfs_do_list(int argc, char **argv)
        if (fields == NULL)
                fields = default_fields;
 
-       /*
-        * If we are only going to list snapshot names and sort by name,
-        * then we can use faster version.
-        */
-       if (strcmp(fields, "name") == 0 && zfs_sort_only_by_name(sortcol))
-               flags |= ZFS_ITER_SIMPLE;
-
        /*
         * If "-o space" and no types were specified, don't display snapshots.
         */
@@ -3738,6 +3732,15 @@ zfs_do_list(int argc, char **argv)
 
        cb.cb_first = B_TRUE;
 
+       /*
+        * If we are only going to list and sort by properties that are "fast"
+        * then we can use "simple" mode and avoid populating the properties
+        * nvlist.
+        */
+       if (zfs_list_only_by_fast(cb.cb_proplist) &&
+           zfs_sort_only_by_fast(sortcol))
+               flags |= ZFS_ITER_SIMPLE;
+
        ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist,
            limit, list_callback, &cb);
 
@@ -4048,7 +4051,7 @@ rollback_check(zfs_handle_t *zhp, void *data)
                }
 
                if (cbp->cb_recurse) {
-                       if (zfs_iter_dependents(zhp, B_TRUE,
+                       if (zfs_iter_dependents(zhp, 0, B_TRUE,
                            rollback_check_dependent, cbp) != 0) {
                                zfs_close(zhp);
                                return (-1);
@@ -4147,10 +4150,10 @@ zfs_do_rollback(int argc, char **argv)
        if (cb.cb_create > 0)
                min_txg = cb.cb_create;
 
-       if ((ret = zfs_iter_snapshots(zhp, B_FALSE, rollback_check, &cb,
+       if ((ret = zfs_iter_snapshots(zhp, 0, rollback_check, &cb,
            min_txg, 0)) != 0)
                goto out;
-       if ((ret = zfs_iter_bookmarks(zhp, rollback_check, &cb)) != 0)
+       if ((ret = zfs_iter_bookmarks(zhp, 0, rollback_check, &cb)) != 0)
                goto out;
 
        if ((ret = cb.cb_error) != 0)
@@ -4292,7 +4295,7 @@ zfs_snapshot_cb(zfs_handle_t *zhp, void *arg)
        free(name);
 
        if (sd->sd_recursive)
-               rv = zfs_iter_filesystems(zhp, zfs_snapshot_cb, sd);
+               rv = zfs_iter_filesystems(zhp, 0, zfs_snapshot_cb, sd);
        zfs_close(zhp);
        return (rv);
 }
@@ -6278,7 +6281,7 @@ zfs_do_allow_unallow_impl(int argc, char **argv, boolean_t un)
 
                if (un && opts.recursive) {
                        struct deleg_perms data = { un, update_perm_nvl };
-                       if (zfs_iter_filesystems(zhp, set_deleg_perms,
+                       if (zfs_iter_filesystems(zhp, 0, set_deleg_perms,
                            &data) != 0)
                                goto cleanup0;
                }
@@ -6641,7 +6644,7 @@ get_one_dataset(zfs_handle_t *zhp, void *data)
        /*
         * Iterate over any nested datasets.
         */
-       if (zfs_iter_filesystems(zhp, get_one_dataset, data) != 0) {
+       if (zfs_iter_filesystems(zhp, 0, get_one_dataset, data) != 0) {
                zfs_close(zhp);
                return (1);
        }

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index 4e2f828cb2ba3ce67d50f148b1bbc19b5141acaa..dd5c3f205f7df89ba6443c715fdfe592eeb083e1 100644 (file)
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -8814,7 +8814,7 @@ check_unsupp_fs(zfs_handle_t *zhp, void *unsupp_fs)
                (*count)++;
        }
 
-       zfs_iter_filesystems(zhp, check_unsupp_fs, unsupp_fs);
+       zfs_iter_filesystems(zhp, 0, check_unsupp_fs, unsupp_fs);
 
        zfs_close(zhp);
 

diff --git a/contrib/pam_zfs_key/pam_zfs_key.c b/contrib/pam_zfs_key/pam_zfs_key.c
index dead090f97011e811fa91c2123eb27132e6f030c..d87384cee65036fcda9eeca27de15fd864cecda0 100644 (file)
--- a/contrib/pam_zfs_key/pam_zfs_key.c
+++ b/contrib/pam_zfs_key/pam_zfs_key.c
@@ -532,7 +532,7 @@ zfs_key_config_get_dataset(zfs_key_config_t *config)
                        return (NULL);
                }
 
-               (void) zfs_iter_filesystems(zhp, find_dsname_by_prop_value,
+               (void) zfs_iter_filesystems(zhp, 0, find_dsname_by_prop_value,
                    config);
                zfs_close(zhp);
                char *dsname = config->dsname;

diff --git a/include/libzfs.h b/include/libzfs.h
index e135ae2ee06688c6059a97fb91727feeadaeebf8..afa6d6a376b7cab288b4cdcc0e6c696565bc23c7 100644 (file)
--- a/include/libzfs.h
+++ b/include/libzfs.h
@@ -644,19 +644,27 @@ _LIBZFS_H void zprop_print_one_property(const char *, zprop_get_cbdata_t *,
 /*
  * Iterator functions.
  */
+#define        ZFS_ITER_RECURSE                (1 << 0)
+#define        ZFS_ITER_ARGS_CAN_BE_PATHS      (1 << 1)
+#define        ZFS_ITER_PROP_LISTSNAPS         (1 << 2)
+#define        ZFS_ITER_DEPTH_LIMIT            (1 << 3)
+#define        ZFS_ITER_RECVD_PROPS            (1 << 4)
+#define        ZFS_ITER_LITERAL_PROPS          (1 << 5)
+#define        ZFS_ITER_SIMPLE                 (1 << 6)
+
 typedef int (*zfs_iter_f)(zfs_handle_t *, void *);
 _LIBZFS_H int zfs_iter_root(libzfs_handle_t *, zfs_iter_f, void *);
-_LIBZFS_H int zfs_iter_children(zfs_handle_t *, zfs_iter_f, void *);
-_LIBZFS_H int zfs_iter_dependents(zfs_handle_t *, boolean_t, zfs_iter_f,
+_LIBZFS_H int zfs_iter_children(zfs_handle_t *, int, zfs_iter_f, void *);
+_LIBZFS_H int zfs_iter_dependents(zfs_handle_t *, int, boolean_t, zfs_iter_f,
     void *);
-_LIBZFS_H int zfs_iter_filesystems(zfs_handle_t *, zfs_iter_f, void *);
-_LIBZFS_H int zfs_iter_snapshots(zfs_handle_t *, boolean_t, zfs_iter_f, void *,
+_LIBZFS_H int zfs_iter_filesystems(zfs_handle_t *, int, zfs_iter_f, void *);
+_LIBZFS_H int zfs_iter_snapshots(zfs_handle_t *, int, zfs_iter_f, void *,
     uint64_t, uint64_t);
-_LIBZFS_H int zfs_iter_snapshots_sorted(zfs_handle_t *, zfs_iter_f, void *,
+_LIBZFS_H int zfs_iter_snapshots_sorted(zfs_handle_t *, int, zfs_iter_f, void *,
     uint64_t, uint64_t);
-_LIBZFS_H int zfs_iter_snapspec(zfs_handle_t *, const char *, zfs_iter_f,
+_LIBZFS_H int zfs_iter_snapspec(zfs_handle_t *, int, const char *, zfs_iter_f,
     void *);
-_LIBZFS_H int zfs_iter_bookmarks(zfs_handle_t *, zfs_iter_f, void *);
+_LIBZFS_H int zfs_iter_bookmarks(zfs_handle_t *, int, zfs_iter_f, void *);
 _LIBZFS_H int zfs_iter_mounted(zfs_handle_t *, zfs_iter_f, void *);
 
 typedef struct get_all_cb {

diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
index 9bd1fd0db0e982ff04e8d4af9c4bafde2d028bba..08767c38140df96c4575378cf04c6fea840357bf 100644 (file)
--- a/lib/libzfs/libzfs.abi
+++ b/lib/libzfs/libzfs.abi
@@ -4009,13 +4009,14 @@
   <abi-instr address-size='64' path='libzfs_iter.c' language='LANG_C99'>
     <function-decl name='zfs_iter_filesystems' mangled-name='zfs_iter_filesystems' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_filesystems'>
       <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='d8e49ab9' name='func'/>
       <parameter type-id='eaa32e2f' name='data'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='zfs_iter_snapshots' mangled-name='zfs_iter_snapshots' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_snapshots'>
       <parameter type-id='9200a744' name='zhp'/>
-      <parameter type-id='c19b74c3' name='simple'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='d8e49ab9' name='func'/>
       <parameter type-id='eaa32e2f' name='data'/>
       <parameter type-id='9c313c2d' name='min_txg'/>
@@ -4024,12 +4025,14 @@
     </function-decl>
     <function-decl name='zfs_iter_bookmarks' mangled-name='zfs_iter_bookmarks' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_bookmarks'>
       <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='d8e49ab9' name='func'/>
       <parameter type-id='eaa32e2f' name='data'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='zfs_iter_snapshots_sorted' mangled-name='zfs_iter_snapshots_sorted' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_snapshots_sorted'>
       <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='d8e49ab9' name='callback'/>
       <parameter type-id='eaa32e2f' name='data'/>
       <parameter type-id='9c313c2d' name='min_txg'/>
@@ -4038,6 +4041,7 @@
     </function-decl>
     <function-decl name='zfs_iter_snapspec' mangled-name='zfs_iter_snapspec' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_snapspec'>
       <parameter type-id='9200a744' name='fs_zhp'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='80f4b756' name='spec_orig'/>
       <parameter type-id='d8e49ab9' name='func'/>
       <parameter type-id='eaa32e2f' name='arg'/>
@@ -4045,12 +4049,14 @@
     </function-decl>
     <function-decl name='zfs_iter_children' mangled-name='zfs_iter_children' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_children'>
       <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='d8e49ab9' name='func'/>
       <parameter type-id='eaa32e2f' name='data'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='zfs_iter_dependents' mangled-name='zfs_iter_dependents' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_iter_dependents'>
       <parameter type-id='9200a744' name='zhp'/>
+      <parameter type-id='95e97e5e' name='flags'/>
       <parameter type-id='c19b74c3' name='allowrecursion'/>
       <parameter type-id='d8e49ab9' name='func'/>
       <parameter type-id='eaa32e2f' name='data'/>

diff --git a/lib/libzfs/libzfs_changelist.c b/lib/libzfs/libzfs_changelist.c
index 4d90a511f60708d2a7b39aad1ff6e93ed5da0a1a..cb0b0fd0dbc6310a8dab502b948f56f76864bc5f 100644 (file)
--- a/lib/libzfs/libzfs_changelist.c
+++ b/lib/libzfs/libzfs_changelist.c
@@ -551,7 +551,7 @@ change_one(zfs_handle_t *zhp, void *data)
                }
 
                if (!clp->cl_alldependents)
-                       ret = zfs_iter_children(zhp, change_one, data);
+                       ret = zfs_iter_children(zhp, 0, change_one, data);
 
                /*
                 * If we added the handle to the changelist, we will re-use it
@@ -721,11 +721,11 @@ changelist_gather(zfs_handle_t *zhp, zfs_prop_t prop, int gather_flags,
                        return (NULL);
                }
        } else if (clp->cl_alldependents) {
-               if (zfs_iter_dependents(zhp, B_TRUE, change_one, clp) != 0) {
+               if (zfs_iter_dependents(zhp, 0, B_TRUE, change_one, clp) != 0) {
                        changelist_free(clp);
                        return (NULL);
                }
-       } else if (zfs_iter_children(zhp, change_one, clp) != 0) {
+       } else if (zfs_iter_children(zhp, 0, change_one, clp) != 0) {
                changelist_free(clp);
                return (NULL);
        }

diff --git a/lib/libzfs/libzfs_crypto.c b/lib/libzfs/libzfs_crypto.c
index cfe04a79273debe6a4de7e8409b03eaa8b2e4aa7..f55c1c957d8430539f79ea377dd003c8fe53adc3 100644 (file)
--- a/lib/libzfs/libzfs_crypto.c
+++ b/lib/libzfs/libzfs_crypto.c
@@ -1226,7 +1226,7 @@ load_keys_cb(zfs_handle_t *zhp, void *arg)
                cb->cb_numfailed++;
 
 out:
-       (void) zfs_iter_filesystems(zhp, load_keys_cb, cb);
+       (void) zfs_iter_filesystems(zhp, 0, load_keys_cb, cb);
        zfs_close(zhp);
 
        /* always return 0, since this function is best effort */

diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
index 5836587d27e29c9e5eb4ef3e2022843dc5752ce8..2b0bba47ab76845d34c85eb94e3c8fb7f4abe41e 100644 (file)
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@ -529,9 +529,17 @@ make_dataset_simple_handle_zc(zfs_handle_t *pzhp, zfs_cmd_t *zc)
 
        zhp->zfs_hdl = pzhp->zfs_hdl;
        (void) strlcpy(zhp->zfs_name, zc->zc_name, sizeof (zhp->zfs_name));
-       zhp->zfs_head_type = pzhp->zfs_type;
-       zhp->zfs_type = ZFS_TYPE_SNAPSHOT;
        zhp->zpool_hdl = zpool_handle(zhp);
+       zhp->zfs_dmustats = zc->zc_objset_stats; /* structure assignment */
+       zhp->zfs_head_type = pzhp->zfs_type;
+       if (zhp->zfs_dmustats.dds_is_snapshot)
+               zhp->zfs_type = ZFS_TYPE_SNAPSHOT;
+       else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZVOL)
+               zhp->zfs_type = ZFS_TYPE_VOLUME;
+       else if (zhp->zfs_dmustats.dds_type == DMU_OST_ZFS)
+               zhp->zfs_type = ZFS_TYPE_FILESYSTEM;
+       else
+               abort();        /* we should never see any other types */
 
        return (zhp);
 }
@@ -737,7 +745,7 @@ zfs_open(libzfs_handle_t *hdl, const char *path, int types)
                 * Iterate bookmarks to find the right one.
                 */
                errno = 0;
-               if ((zfs_iter_bookmarks(pzhp, zfs_open_bookmarks_cb,
+               if ((zfs_iter_bookmarks(pzhp, 0, zfs_open_bookmarks_cb,
                    &cb_data) == 0) && (cb_data.zhp == NULL)) {
                        (void) zfs_error(hdl, EZFS_NOENT, errbuf);
                        zfs_close(pzhp);
@@ -2087,7 +2095,8 @@ getprop_string(zfs_handle_t *zhp, zfs_prop_t prop, char **source)
 static boolean_t
 zfs_is_recvd_props_mode(zfs_handle_t *zhp)
 {
-       return (zhp->zfs_props == zhp->zfs_recvd_props);
+       return (zhp->zfs_props != NULL &&
+           zhp->zfs_props == zhp->zfs_recvd_props);
 }
 
 static void
@@ -2292,6 +2301,20 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
                *val = zhp->zfs_dmustats.dds_redacted;
                break;
 
+       case ZFS_PROP_GUID:
+               if (zhp->zfs_dmustats.dds_guid != 0)
+                       *val = zhp->zfs_dmustats.dds_guid;
+               else
+                       *val = getprop_uint64(zhp, prop, source);
+               break;
+
+       case ZFS_PROP_CREATETXG:
+               if (zhp->zfs_dmustats.dds_creation_txg != 0)
+                       *val = zhp->zfs_dmustats.dds_creation_txg;
+               else
+                       *val = getprop_uint64(zhp, prop, source);
+               break;
+
        default:
                switch (zfs_prop_get_type(prop)) {
                case PROP_TYPE_NUMBER:
@@ -2435,7 +2458,7 @@ get_clones_cb(zfs_handle_t *zhp, void *arg)
        }
 
 out:
-       (void) zfs_iter_children(zhp, get_clones_cb, gca);
+       (void) zfs_iter_children(zhp, 0, get_clones_cb, gca);
        zfs_close(zhp);
        return (0);
 }
@@ -2722,7 +2745,9 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen,
                break;
 
        case ZFS_PROP_ORIGIN:
-               str = getprop_string(zhp, prop, &source);
+               str = (char *)&zhp->zfs_dmustats.dds_origin;
+               if (*str == '\0')
+                       str = zfs_prop_default_string(prop);
                if (str == NULL)
                        return (-1);
                (void) strlcpy(propbuf, str, proplen);
@@ -3857,7 +3882,7 @@ zfs_check_snap_cb(zfs_handle_t *zhp, void *arg)
        if (lzc_exists(name))
                verify(nvlist_add_boolean(dd->nvl, name) == 0);
 
-       rv = zfs_iter_filesystems(zhp, zfs_check_snap_cb, dd);
+       rv = zfs_iter_filesystems(zhp, 0, zfs_check_snap_cb, dd);
        zfs_close(zhp);
        return (rv);
 }
@@ -4098,7 +4123,7 @@ zfs_snapshot_cb(zfs_handle_t *zhp, void *arg)
 
                fnvlist_add_boolean(sd->sd_nvl, name);
 
-               rv = zfs_iter_filesystems(zhp, zfs_snapshot_cb, sd);
+               rv = zfs_iter_filesystems(zhp, 0, zfs_snapshot_cb, sd);
        }
        zfs_close(zhp);
 
@@ -4273,7 +4298,7 @@ rollback_destroy(zfs_handle_t *zhp, void *data)
        rollback_data_t *cbp = data;
 
        if (zfs_prop_get_int(zhp, ZFS_PROP_CREATETXG) > cbp->cb_create) {
-               cbp->cb_error |= zfs_iter_dependents(zhp, B_FALSE,
+               cbp->cb_error |= zfs_iter_dependents(zhp, 0, B_FALSE,
                    rollback_destroy_dependent, cbp);
 
                cbp->cb_error |= zfs_destroy(zhp, B_FALSE);
@@ -4313,10 +4338,10 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force)
        if (cb.cb_create > 0)
                min_txg = cb.cb_create;
 
-       (void) zfs_iter_snapshots(zhp, B_FALSE, rollback_destroy, &cb,
+       (void) zfs_iter_snapshots(zhp, 0, rollback_destroy, &cb,
            min_txg, 0);
 
-       (void) zfs_iter_bookmarks(zhp, rollback_destroy, &cb);
+       (void) zfs_iter_bookmarks(zhp, 0, rollback_destroy, &cb);
 
        if (cb.cb_error)
                return (-1);
@@ -4908,7 +4933,7 @@ zfs_hold_one(zfs_handle_t *zhp, void *arg)
                fnvlist_add_string(ha->nvl, name, ha->tag);
 
        if (ha->recursive)
-               rv = zfs_iter_filesystems(zhp, zfs_hold_one, ha);
+               rv = zfs_iter_filesystems(zhp, 0, zfs_hold_one, ha);
        zfs_close(zhp);
        return (rv);
 }
@@ -5039,7 +5064,7 @@ zfs_release_one(zfs_handle_t *zhp, void *arg)
        }
 
        if (ha->recursive)
-               rv = zfs_iter_filesystems(zhp, zfs_release_one, ha);
+               rv = zfs_iter_filesystems(zhp, 0, zfs_release_one, ha);
        zfs_close(zhp);
        return (rv);
 }

diff --git a/lib/libzfs/libzfs_iter.c b/lib/libzfs/libzfs_iter.c
index 3c537be79487ee2b71801768647bc84e115096fb..0e9d972017d1cb18a82942c23cddf035a138e894 100644 (file)
--- a/lib/libzfs/libzfs_iter.c
+++ b/lib/libzfs/libzfs_iter.c
@@ -39,7 +39,7 @@
 #include "libzfs_impl.h"
 
 static int
-zfs_iter_clones(zfs_handle_t *zhp, zfs_iter_f func, void *data)
+zfs_iter_clones(zfs_handle_t *zhp, int flags, zfs_iter_f func, void *data)
 {
        nvlist_t *nvl = zfs_get_clones_nvl(zhp);
        nvpair_t *pair;
@@ -104,7 +104,7 @@ top:
  * Iterate over all child filesystems
  */
 int
-zfs_iter_filesystems(zfs_handle_t *zhp, zfs_iter_f func, void *data)
+zfs_iter_filesystems(zfs_handle_t *zhp, int flags, zfs_iter_f func, void *data)
 {
        zfs_cmd_t zc = {"\0"};
        zfs_handle_t *nzhp;
@@ -113,19 +113,24 @@ zfs_iter_filesystems(zfs_handle_t *zhp, zfs_iter_f func, void *data)
        if (zhp->zfs_type != ZFS_TYPE_FILESYSTEM)
                return (0);
 
+       if ((flags & ZFS_ITER_SIMPLE) == ZFS_ITER_SIMPLE)
+               zc.zc_simple = B_TRUE;
+
        if (zcmd_alloc_dst_nvlist(zhp->zfs_hdl, &zc, 0) != 0)
                return (-1);
 
        while ((ret = zfs_do_list_ioctl(zhp, ZFS_IOC_DATASET_LIST_NEXT,
            &zc)) == 0) {
+               if (zc.zc_simple)
+                       nzhp = make_dataset_simple_handle_zc(zhp, &zc);
+               else
+                       nzhp = make_dataset_handle_zc(zhp->zfs_hdl, &zc);
                /*
                 * Silently ignore errors, as the only plausible explanation is
                 * that the pool has since been removed.
                 */
-               if ((nzhp = make_dataset_handle_zc(zhp->zfs_hdl,
-                   &zc)) == NULL) {
+               if (nzhp == NULL)
                        continue;
-               }
 
                if ((ret = func(nzhp, data)) != 0) {
                        zcmd_free_nvlists(&zc);
@@ -140,7 +145,7 @@ zfs_iter_filesystems(zfs_handle_t *zhp, zfs_iter_f func, void *data)
  * Iterate over all snapshots
  */
 int
-zfs_iter_snapshots(zfs_handle_t *zhp, boolean_t simple, zfs_iter_f func,
+zfs_iter_snapshots(zfs_handle_t *zhp, int flags, zfs_iter_f func,
     void *data, uint64_t min_txg, uint64_t max_txg)
 {
        zfs_cmd_t zc = {"\0"};
@@ -152,7 +157,7 @@ zfs_iter_snapshots(zfs_handle_t *zhp, boolean_t simple, zfs_iter_f func,
            zhp->zfs_type == ZFS_TYPE_BOOKMARK)
                return (0);
 
-       zc.zc_simple = simple;
+       zc.zc_simple = (flags & ZFS_ITER_SIMPLE) != 0;
 
        if (zcmd_alloc_dst_nvlist(zhp->zfs_hdl, &zc, 0) != 0)
                return (-1);
@@ -177,7 +182,7 @@ zfs_iter_snapshots(zfs_handle_t *zhp, boolean_t simple, zfs_iter_f func,
        while ((ret = zfs_do_list_ioctl(zhp, ZFS_IOC_SNAPSHOT_LIST_NEXT,
            &zc)) == 0) {
 
-               if (simple)
+               if (zc.zc_simple)
                        nzhp = make_dataset_simple_handle_zc(zhp, &zc);
                else
                        nzhp = make_dataset_handle_zc(zhp->zfs_hdl, &zc);
@@ -199,7 +204,7 @@ zfs_iter_snapshots(zfs_handle_t *zhp, boolean_t simple, zfs_iter_f func,
  * Iterate over all bookmarks
  */
 int
-zfs_iter_bookmarks(zfs_handle_t *zhp, zfs_iter_f func, void *data)
+zfs_iter_bookmarks(zfs_handle_t *zhp, int flags, zfs_iter_f func, void *data)
 {
        zfs_handle_t *nzhp;
        nvlist_t *props = NULL;
@@ -306,8 +311,8 @@ zfs_snapshot_compare(const void *larg, const void *rarg)
 }
 
 int
-zfs_iter_snapshots_sorted(zfs_handle_t *zhp, zfs_iter_f callback, void *data,
-    uint64_t min_txg, uint64_t max_txg)
+zfs_iter_snapshots_sorted(zfs_handle_t *zhp, int flags, zfs_iter_f callback,
+    void *data, uint64_t min_txg, uint64_t max_txg)
 {
        int ret = 0;
        zfs_node_t *node;
@@ -317,7 +322,7 @@ zfs_iter_snapshots_sorted(zfs_handle_t *zhp, zfs_iter_f callback, void *data,
        avl_create(&avl, zfs_snapshot_compare,
            sizeof (zfs_node_t), offsetof(zfs_node_t, zn_avlnode));
 
-       ret = zfs_iter_snapshots(zhp, B_FALSE, zfs_sort_snaps, &avl, min_txg,
+       ret = zfs_iter_snapshots(zhp, flags, zfs_sort_snaps, &avl, min_txg,
            max_txg);
 
        for (node = avl_first(&avl); node != NULL; node = AVL_NEXT(&avl, node))
@@ -380,7 +385,7 @@ snapspec_cb(zfs_handle_t *zhp, void *arg)
  * return ENOENT at the end.
  */
 int
-zfs_iter_snapspec(zfs_handle_t *fs_zhp, const char *spec_orig,
+zfs_iter_snapspec(zfs_handle_t *fs_zhp, int flags, const char *spec_orig,
     zfs_iter_f func, void *arg)
 {
        char *buf, *comma_separated, *cp;
@@ -420,7 +425,7 @@ zfs_iter_snapspec(zfs_handle_t *fs_zhp, const char *spec_orig,
                                }
                        }
 
-                       err = zfs_iter_snapshots_sorted(fs_zhp,
+                       err = zfs_iter_snapshots_sorted(fs_zhp, flags,
                            snapspec_cb, &ssa, 0, 0);
                        if (ret == 0)
                                ret = err;
@@ -457,14 +462,14 @@ zfs_iter_snapspec(zfs_handle_t *fs_zhp, const char *spec_orig,
  * and as close as possible.
  */
 int
-zfs_iter_children(zfs_handle_t *zhp, zfs_iter_f func, void *data)
+zfs_iter_children(zfs_handle_t *zhp, int flags, zfs_iter_f func, void *data)
 {
        int ret;
 
-       if ((ret = zfs_iter_snapshots(zhp, B_FALSE, func, data, 0, 0)) != 0)
+       if ((ret = zfs_iter_snapshots(zhp, flags, func, data, 0, 0)) != 0)
                return (ret);
 
-       return (zfs_iter_filesystems(zhp, func, data));
+       return (zfs_iter_filesystems(zhp, flags, func, data));
 }
 
 
@@ -475,6 +480,7 @@ typedef struct iter_stack_frame {
 
 typedef struct iter_dependents_arg {
        boolean_t first;
+       int flags;
        boolean_t allowrecursion;
        iter_stack_frame_t *stack;
        zfs_iter_f func;
@@ -490,7 +496,7 @@ iter_dependents_cb(zfs_handle_t *zhp, void *arg)
        ida->first = B_FALSE;
 
        if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT) {
-               err = zfs_iter_clones(zhp, iter_dependents_cb, ida);
+               err = zfs_iter_clones(zhp, ida->flags, iter_dependents_cb, ida);
        } else if (zhp->zfs_type != ZFS_TYPE_BOOKMARK) {
                iter_stack_frame_t isf;
                iter_stack_frame_t *f;
@@ -524,9 +530,10 @@ iter_dependents_cb(zfs_handle_t *zhp, void *arg)
                isf.zhp = zhp;
                isf.next = ida->stack;
                ida->stack = &isf;
-               err = zfs_iter_filesystems(zhp, iter_dependents_cb, ida);
+               err = zfs_iter_filesystems(zhp, ida->flags,
+                   iter_dependents_cb, ida);
                if (err == 0)
-                       err = zfs_iter_snapshots(zhp, B_FALSE,
+                       err = zfs_iter_snapshots(zhp, ida->flags,
                            iter_dependents_cb, ida, 0, 0);
                ida->stack = isf.next;
        }
@@ -540,10 +547,11 @@ iter_dependents_cb(zfs_handle_t *zhp, void *arg)
 }
 
 int
-zfs_iter_dependents(zfs_handle_t *zhp, boolean_t allowrecursion,
+zfs_iter_dependents(zfs_handle_t *zhp, int flags, boolean_t allowrecursion,
     zfs_iter_f func, void *data)
 {
        iter_dependents_arg_t ida;
+       ida.flags = flags;
        ida.allowrecursion = allowrecursion;
        ida.stack = NULL;
        ida.func = func;

diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c
index e97de8f20262b89821e8206892fb9c8e5865718a..62fed92fa901aaf32c2510e87c91a583d68811fa 100644 (file)
--- a/lib/libzfs/libzfs_mount.c
+++ b/lib/libzfs/libzfs_mount.c
@@ -1128,7 +1128,7 @@ zfs_iter_cb(zfs_handle_t *zhp, void *data)
        }
 
        libzfs_add_handle(cbp, zhp);
-       if (zfs_iter_filesystems(zhp, zfs_iter_cb, cbp) != 0) {
+       if (zfs_iter_filesystems(zhp, 0, zfs_iter_cb, cbp) != 0) {
                zfs_close(zhp);
                return (-1);
        }
@@ -1475,7 +1475,7 @@ zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags)
         * over all child filesystems.
         */
        libzfs_add_handle(&cb, zfsp);
-       if (zfs_iter_filesystems(zfsp, zfs_iter_cb, &cb) != 0)
+       if (zfs_iter_filesystems(zfsp, 0, zfs_iter_cb, &cb) != 0)
                goto out;
 
        /*

diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c
index 7460ffc4133b644c84c157cc63a3095fe8f5f606..098c7777ce65894f90c44900930300c9be5d87c6 100644 (file)
--- a/lib/libzfs/libzfs_sendrecv.c
+++ b/lib/libzfs/libzfs_sendrecv.c
@@ -597,7 +597,7 @@ send_iterate_fs(zfs_handle_t *zhp, void *arg)
                        min_txg = fromsnap_txg;
                if (!sd->replicate && tosnap_txg != 0)
                        max_txg = tosnap_txg;
-               (void) zfs_iter_snapshots_sorted(zhp, send_iterate_snap, sd,
+               (void) zfs_iter_snapshots_sorted(zhp, 0, send_iterate_snap, sd,
                    min_txg, max_txg);
        } else {
                char snapname[MAXPATHLEN] = { 0 };
@@ -640,7 +640,7 @@ send_iterate_fs(zfs_handle_t *zhp, void *arg)
 
        /* iterate over children */
        if (sd->recursive)
-               rv = zfs_iter_filesystems(zhp, send_iterate_fs, sd);
+               rv = zfs_iter_filesystems(zhp, 0, send_iterate_fs, sd);
 
 out:
        sd->parent_fromsnap_guid = parent_fromsnap_guid_save;
@@ -1212,7 +1212,7 @@ dump_filesystem(zfs_handle_t *zhp, void *arg)
                if (!sdd->replicate && sdd->tosnap != NULL)
                        max_txg = get_snap_txg(zhp->zfs_hdl, zhp->zfs_name,
                            sdd->tosnap);
-               rv = zfs_iter_snapshots_sorted(zhp, dump_snapshot, arg,
+               rv = zfs_iter_snapshots_sorted(zhp, 0, dump_snapshot, arg,
                    min_txg, max_txg);
        } else {
                char snapname[MAXPATHLEN] = { 0 };
@@ -2959,9 +2959,9 @@ guid_to_name_cb(zfs_handle_t *zhp, void *arg)
                return (EEXIST);
        }
 
-       err = zfs_iter_children(zhp, guid_to_name_cb, gtnd);
+       err = zfs_iter_children(zhp, 0, guid_to_name_cb, gtnd);
        if (err != EEXIST && gtnd->bookmark_ok)
-               err = zfs_iter_bookmarks(zhp, guid_to_name_cb, gtnd);
+               err = zfs_iter_bookmarks(zhp, 0, guid_to_name_cb, gtnd);
        zfs_close(zhp);
        return (err);
 }
@@ -3015,9 +3015,10 @@ guid_to_name_redact_snaps(libzfs_handle_t *hdl, const char *parent,
                        continue;
                int err = guid_to_name_cb(zfs_handle_dup(zhp), &gtnd);
                if (err != EEXIST)
-                       err = zfs_iter_children(zhp, guid_to_name_cb, &gtnd);
+                       err = zfs_iter_children(zhp, 0, guid_to_name_cb, &gtnd);
                if (err != EEXIST && bookmark_ok)
-                       err = zfs_iter_bookmarks(zhp, guid_to_name_cb, &gtnd);
+                       err = zfs_iter_bookmarks(zhp, 0, guid_to_name_cb,
+                           &gtnd);
                zfs_close(zhp);
                if (err == EEXIST)
                        return (0);

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index ca2da561220b50d59e04d0afde97c9aec4b27c30..065540bbd2add7273a3e6e0e49aaa025255ece84 100644 (file)
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -2044,7 +2044,7 @@ zfs_ioc_objset_stats_impl(zfs_cmd_t *zc, objset_t *os)
 
        dmu_objset_fast_stat(os, &zc->zc_objset_stats);
 
-       if (zc->zc_nvlist_dst != 0 &&
+       if (!zc->zc_simple && zc->zc_nvlist_dst != 0 &&
            (error = dsl_prop_get_all(os, &nv)) == 0) {
                dmu_objset_stats(os, nv);
                /*
@@ -2331,6 +2331,7 @@ zfs_ioc_snapshot_list_next(zfs_cmd_t *zc)
                }
 
                if (zc->zc_simple) {
+                       dsl_dataset_fast_stat(ds, &zc->zc_objset_stats);
                        dsl_dataset_rele(ds, FTAG);
                        break;
                }