| spa.c (268126) | spa.c (268473) |
|---|---|
| 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 --- 675 unchanged lines hidden (view full) --- 684 685 /* 686 * In addition to the pool directory object, we might 687 * create the pool properties object, the features for 688 * read object, the features for write object, or the 689 * feature descriptions object. 690 */ 691 error = dsl_sync_task(spa->spa_name, NULL, | 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 --- 675 unchanged lines hidden (view full) --- 684 685 /* 686 * In addition to the pool directory object, we might 687 * create the pool properties object, the features for 688 * read object, the features for write object, or the 689 * feature descriptions object. 690 */ 691 error = dsl_sync_task(spa->spa_name, NULL, |
| 692 spa_sync_version, &ver, 6); | 692 spa_sync_version, &ver, 693 6, ZFS_SPACE_CHECK_RESERVED); |
| 693 if (error) 694 return (error); 695 continue; 696 } 697 698 need_sync = B_TRUE; 699 break; 700 } 701 702 if (need_sync) { 703 return (dsl_sync_task(spa->spa_name, NULL, spa_sync_props, | 694 if (error) 695 return (error); 696 continue; 697 } 698 699 need_sync = B_TRUE; 700 break; 701 } 702 703 if (need_sync) { 704 return (dsl_sync_task(spa->spa_name, NULL, spa_sync_props, |
| 704 nvp, 6)); | 705 nvp, 6, ZFS_SPACE_CHECK_RESERVED)); |
| 705 } 706 707 return (0); 708} 709 710/* 711 * If the bootfs property value is dsobj, clear it. 712 */ --- 64 unchanged lines hidden (view full) --- 777 int error; 778 uint64_t guid; 779 780 mutex_enter(&spa->spa_vdev_top_lock); 781 mutex_enter(&spa_namespace_lock); 782 guid = spa_generate_guid(NULL); 783 784 error = dsl_sync_task(spa->spa_name, spa_change_guid_check, | 706 } 707 708 return (0); 709} 710 711/* 712 * If the bootfs property value is dsobj, clear it. 713 */ --- 64 unchanged lines hidden (view full) --- 778 int error; 779 uint64_t guid; 780 781 mutex_enter(&spa->spa_vdev_top_lock); 782 mutex_enter(&spa_namespace_lock); 783 guid = spa_generate_guid(NULL); 784 785 error = dsl_sync_task(spa->spa_name, spa_change_guid_check, |
| 785 spa_change_guid_sync, &guid, 5); | 786 spa_change_guid_sync, &guid, 5, ZFS_SPACE_CHECK_RESERVED); |
| 786 787 if (error == 0) { 788 spa_config_sync(spa, B_FALSE, B_TRUE); 789 spa_event_notify(spa, NULL, ESC_ZFS_POOL_REGUID); 790 } 791 792 mutex_exit(&spa_namespace_lock); 793 mutex_exit(&spa->spa_vdev_top_lock); --- 6104 unchanged lines hidden --- | 787 788 if (error == 0) { 789 spa_config_sync(spa, B_FALSE, B_TRUE); 790 spa_event_notify(spa, NULL, ESC_ZFS_POOL_REGUID); 791 } 792 793 mutex_exit(&spa_namespace_lock); 794 mutex_exit(&spa->spa_vdev_top_lock); --- 6104 unchanged lines hidden --- |