From 1ba4a712dde6e6c613fc411a96958b4ade67de4c Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Mon, 17 Nov 2008 20:49:29 +0000 Subject: Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes. This bring huge amount of changes, I'll enumerate only user-visible changes: - Delegated Administration Allows regular users to perform ZFS operations, like file system creation, snapshot creation, etc. - L2ARC Level 2 cache for ZFS - allows to use additional disks for cache. Huge performance improvements mostly for random read of mostly static content. - slog Allow to use additional disks for ZFS Intent Log to speed up operations like fsync(2). - vfs.zfs.super_owner Allows regular users to perform privileged operations on files stored on ZFS file systems owned by him. Very careful with this one. - chflags(2) Not all the flags are supported. This still needs work. - ZFSBoot Support to boot off of ZFS pool. Not finished, AFAIK. Submitted by: dfr - Snapshot properties - New failure modes Before if write requested failed, system paniced. Now one can select from one of three failure modes: - panic - panic on write error - wait - wait for disk to reappear - continue - serve read requests if possible, block write requests - Refquota, refreservation properties Just quota and reservation properties, but don't count space consumed by children file systems, clones and snapshots. - Sparse volumes ZVOLs that don't reserve space in the pool. - External attributes Compatible with extattr(2). - NFSv4-ACLs Not sure about the status, might not be complete yet. Submitted by: trasz - Creation-time properties - Regression tests for zpool(8) command. Obtained from: OpenSolaris --- cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c') diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c index f72417974217..6ba91b105fe9 100644 --- a/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c +++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c @@ -53,6 +53,7 @@ struct zpool_list { boolean_t zl_findall; uu_avl_t *zl_avl; uu_avl_pool_t *zl_pool; + zprop_list_t **zl_proplist; }; /* ARGSUSED */ @@ -81,6 +82,12 @@ add_pool(zpool_handle_t *zhp, void *data) node->zn_handle = zhp; uu_avl_node_init(node, &node->zn_avlnode, zlp->zl_pool); if (uu_avl_find(zlp->zl_avl, node, NULL, &idx) == NULL) { + if (zlp->zl_proplist && + zpool_expand_proplist(zhp, zlp->zl_proplist) != 0) { + zpool_close(zhp); + free(node); + return (-1); + } uu_avl_insert(zlp->zl_avl, node, idx); } else { zpool_close(zhp); @@ -98,7 +105,7 @@ add_pool(zpool_handle_t *zhp, void *data) * line. */ zpool_list_t * -pool_list_get(int argc, char **argv, zpool_proplist_t **proplist, int *err) +pool_list_get(int argc, char **argv, zprop_list_t **proplist, int *err) { zpool_list_t *zlp; @@ -114,6 +121,8 @@ pool_list_get(int argc, char **argv, zpool_proplist_t **proplist, int *err) UU_DEFAULT)) == NULL) zpool_no_memory(); + zlp->zl_proplist = proplist; + if (argc == 0) { (void) zpool_iter(g_zfs, add_pool, zlp); zlp->zl_findall = B_TRUE; @@ -123,13 +132,12 @@ pool_list_get(int argc, char **argv, zpool_proplist_t **proplist, int *err) for (i = 0; i < argc; i++) { zpool_handle_t *zhp; - if ((zhp = zpool_open_canfail(g_zfs, - argv[i])) != NULL && add_pool(zhp, zlp) == 0) { - if (proplist && - zpool_expand_proplist(zhp, proplist) != 0) + if (zhp = zpool_open_canfail(g_zfs, argv[i])) { + if (add_pool(zhp, zlp) != 0) *err = B_TRUE; - } else + } else { *err = B_TRUE; + } } } @@ -228,7 +236,7 @@ pool_list_count(zpool_list_t *zlp) */ int for_each_pool(int argc, char **argv, boolean_t unavail, - zpool_proplist_t **proplist, zpool_iter_f func, void *data) + zprop_list_t **proplist, zpool_iter_f func, void *data) { zpool_list_t *list; int ret = 0; -- cgit v1.2.3