diff options
| author | Brian Behlendorf <[email protected]> | 2016-01-26 17:27:46 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-28 12:44:39 -0500 |
| commit | b6fcb792ca2dad7fb2d190efa416ad8b718675b4 (patch) | |
| tree | 9b8462e99bff3eb617c53853b9bf62a94b75f50d /module/zfs/spa.c | |
| parent | 1a04bab34808694f3bf1cef3dc208c9499d103aa (diff) | |
Illumos 6414 - vdev_config_sync could be simpler
6414 vdev_config_sync could be simpler
Reviewed by: George Wilson <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
References:
https://www.illumos.org/issues/6414
https://github.com/illumos/illumos-gate/commit/eb5bb58
Ported-by: Brian Behlendorf <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Diffstat (limited to 'module/zfs/spa.c')
| -rw-r--r-- | module/zfs/spa.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 787b03d29..ea4eb9f9a 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -6518,16 +6518,10 @@ spa_sync(spa_t *spa, uint64_t txg) if (svdcount == SPA_DVAS_PER_BP) break; } - error = vdev_config_sync(svd, svdcount, txg, B_FALSE); - if (error != 0) - error = vdev_config_sync(svd, svdcount, txg, - B_TRUE); + error = vdev_config_sync(svd, svdcount, txg); } else { error = vdev_config_sync(rvd->vdev_child, - rvd->vdev_children, txg, B_FALSE); - if (error != 0) - error = vdev_config_sync(rvd->vdev_child, - rvd->vdev_children, txg, B_TRUE); + rvd->vdev_children, txg); } if (error == 0) |