Deleted Added
full compact
libzfs_dataset.c (238422) libzfs_dataset.c (239774)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 3532 unchanged lines hidden (view full) ---

3541 boolean_t restore_resv = 0;
3542 uint64_t old_volsize, new_volsize;
3543 zfs_prop_t resv_prop;
3544
3545 assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
3546 zhp->zfs_type == ZFS_TYPE_VOLUME);
3547
3548 /*
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 3532 unchanged lines hidden (view full) ---

3541 boolean_t restore_resv = 0;
3542 uint64_t old_volsize, new_volsize;
3543 zfs_prop_t resv_prop;
3544
3545 assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
3546 zhp->zfs_type == ZFS_TYPE_VOLUME);
3547
3548 /*
3549 * Destroy all recent snapshots and its dependends.
3549 * Destroy all recent snapshots and their dependents.
3550 */
3551 cb.cb_force = force;
3552 cb.cb_target = snap->zfs_name;
3553 cb.cb_create = zfs_prop_get_int(snap, ZFS_PROP_CREATETXG);
3554 (void) zfs_iter_children(zhp, rollback_destroy, &cb);
3555
3556 if (cb.cb_error)
3557 return (-1);

--- 920 unchanged lines hidden ---
3550 */
3551 cb.cb_force = force;
3552 cb.cb_target = snap->zfs_name;
3553 cb.cb_create = zfs_prop_get_int(snap, ZFS_PROP_CREATETXG);
3554 (void) zfs_iter_children(zhp, rollback_destroy, &cb);
3555
3556 if (cb.cb_error)
3557 return (-1);

--- 920 unchanged lines hidden ---