Deleted Added
full compact
spa.c (294102) spa.c (294811)
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

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

6763 for (int c = 0; c < children; c++) {
6764 vd = rvd->vdev_child[(c0 + c) % children];
6765 if (vd->vdev_ms_array == 0 || vd->vdev_islog)
6766 continue;
6767 svd[svdcount++] = vd;
6768 if (svdcount == SPA_DVAS_PER_BP)
6769 break;
6770 }
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

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

6763 for (int c = 0; c < children; c++) {
6764 vd = rvd->vdev_child[(c0 + c) % children];
6765 if (vd->vdev_ms_array == 0 || vd->vdev_islog)
6766 continue;
6767 svd[svdcount++] = vd;
6768 if (svdcount == SPA_DVAS_PER_BP)
6769 break;
6770 }
6771 error = vdev_config_sync(svd, svdcount, txg, B_FALSE);
6772 if (error != 0)
6773 error = vdev_config_sync(svd, svdcount, txg,
6774 B_TRUE);
6771 error = vdev_config_sync(svd, svdcount, txg);
6775 } else {
6776 error = vdev_config_sync(rvd->vdev_child,
6772 } else {
6773 error = vdev_config_sync(rvd->vdev_child,
6777 rvd->vdev_children, txg, B_FALSE);
6778 if (error != 0)
6779 error = vdev_config_sync(rvd->vdev_child,
6780 rvd->vdev_children, txg, B_TRUE);
6774 rvd->vdev_children, txg);
6781 }
6782
6783 if (error == 0)
6784 spa->spa_last_synced_guid = rvd->vdev_guid;
6785
6786 spa_config_exit(spa, SCL_STATE, FTAG);
6787
6788 if (error == 0)

--- 273 unchanged lines hidden ---
6775 }
6776
6777 if (error == 0)
6778 spa->spa_last_synced_guid = rvd->vdev_guid;
6779
6780 spa_config_exit(spa, SCL_STATE, FTAG);
6781
6782 if (error == 0)

--- 273 unchanged lines hidden ---