Deleted Added
full compact
zvol.c (269002) zvol.c (269006)
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

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

2109 * the raidz vdev itself has 3 children.
2110 */
2111 if (vd->vdev_children > 1 || vd->vdev_ops == &vdev_raidz_ops) {
2112 if (!spa_feature_is_enabled(spa,
2113 SPA_FEATURE_MULTI_VDEV_CRASH_DUMP))
2114 return (SET_ERROR(ENOTSUP));
2115 (void) dsl_sync_task(spa_name(spa),
2116 zfs_mvdev_dump_feature_check,
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

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

2109 * the raidz vdev itself has 3 children.
2110 */
2111 if (vd->vdev_children > 1 || vd->vdev_ops == &vdev_raidz_ops) {
2112 if (!spa_feature_is_enabled(spa,
2113 SPA_FEATURE_MULTI_VDEV_CRASH_DUMP))
2114 return (SET_ERROR(ENOTSUP));
2115 (void) dsl_sync_task(spa_name(spa),
2116 zfs_mvdev_dump_feature_check,
2117 zfs_mvdev_dump_activate_feature_sync, NULL, 2);
2117 zfs_mvdev_dump_activate_feature_sync, NULL,
2118 2, ZFS_SPACE_CHECK_RESERVED);
2118 }
2119
2120 tx = dmu_tx_create(os);
2121 dmu_tx_hold_zap(tx, ZVOL_ZAP_OBJ, TRUE, NULL);
2122 dmu_tx_hold_bonus(tx, ZVOL_OBJ);
2123 error = dmu_tx_assign(tx, TXG_WAIT);
2124 if (error) {
2125 dmu_tx_abort(tx);

--- 722 unchanged lines hidden ---
2119 }
2120
2121 tx = dmu_tx_create(os);
2122 dmu_tx_hold_zap(tx, ZVOL_ZAP_OBJ, TRUE, NULL);
2123 dmu_tx_hold_bonus(tx, ZVOL_OBJ);
2124 error = dmu_tx_assign(tx, TXG_WAIT);
2125 if (error) {
2126 dmu_tx_abort(tx);

--- 722 unchanged lines hidden ---