svn commit: r294810 - in vendor-sys/illumos/dist/uts/common/fs/zfs: . sys
Alexander Motin
mav at FreeBSD.org
Tue Jan 26 12:55:45 UTC 2016
Author: mav
Date: Tue Jan 26 12:55:43 2016
New Revision: 294810
URL: https://svnweb.freebsd.org/changeset/base/294810
Log:
6414 vdev_config_sync could be simpler
Reviewed by: George Wilson <george.wilson at delphix.com>
Reviewed by: Matthew Ahrens <mahrens at delphix.com>
Approved by: Robert Mustacchi <rm at joyent.com>
Author: Will Andrews <will at firepipe.net>
illumos/illumos-gate at eb5bb58421f46cee79155a55688e6c675e7dd361
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev.h
vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Tue Jan 26 12:54:03 2016 (r294809)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Tue Jan 26 12:55:43 2016 (r294810)
@@ -6423,16 +6423,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)
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev.h Tue Jan 26 12:54:03 2016 (r294809)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/vdev.h Tue Jan 26 12:55:43 2016 (r294810)
@@ -122,8 +122,7 @@ extern void vdev_queue_io_done(zio_t *zi
extern void vdev_config_dirty(vdev_t *vd);
extern void vdev_config_clean(vdev_t *vd);
-extern int vdev_config_sync(vdev_t **svd, int svdcount, uint64_t txg,
- boolean_t);
+extern int vdev_config_sync(vdev_t **svd, int svdcount, uint64_t txg);
extern void vdev_state_dirty(vdev_t *vd);
extern void vdev_state_clean(vdev_t *vd);
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c Tue Jan 26 12:54:03 2016 (r294809)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev_label.c Tue Jan 26 12:55:43 2016 (r294810)
@@ -1177,15 +1177,16 @@ vdev_label_sync_list(spa_t *spa, int l,
* at any time, you can just call it again, and it will resume its work.
*/
int
-vdev_config_sync(vdev_t **svd, int svdcount, uint64_t txg, boolean_t tryhard)
+vdev_config_sync(vdev_t **svd, int svdcount, uint64_t txg)
{
spa_t *spa = svd[0]->vdev_spa;
uberblock_t *ub = &spa->spa_uberblock;
vdev_t *vd;
zio_t *zio;
- int error;
+ int error = 0;
int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL;
+retry:
/*
* Normally, we don't want to try too hard to write every label and
* uberblock. If there is a flaky disk, we don't want the rest of the
@@ -1193,8 +1194,11 @@ vdev_config_sync(vdev_t **svd, int svdco
* single label out, we should retry with ZIO_FLAG_TRYHARD before
* bailing out and declaring the pool faulted.
*/
- if (tryhard)
+ if (error != 0) {
+ if ((flags & ZIO_FLAG_TRYHARD) != 0)
+ return (error);
flags |= ZIO_FLAG_TRYHARD;
+ }
ASSERT(ub->ub_txg <= txg);
@@ -1238,7 +1242,7 @@ vdev_config_sync(vdev_t **svd, int svdco
* are committed to stable storage before the uberblock update.
*/
if ((error = vdev_label_sync_list(spa, 0, txg, flags)) != 0)
- return (error);
+ goto retry;
/*
* Sync the uberblocks to all vdevs in svd[].
@@ -1256,7 +1260,7 @@ vdev_config_sync(vdev_t **svd, int svdco
* to the new uberblocks.
*/
if ((error = vdev_uberblock_sync_list(svd, svdcount, ub, flags)) != 0)
- return (error);
+ goto retry;
/*
* Sync out odd labels for every dirty vdev. If the system dies
@@ -1268,5 +1272,8 @@ vdev_config_sync(vdev_t **svd, int svdco
* to disk to ensure that all odd-label updates are committed to
* stable storage before the next transaction group begins.
*/
- return (vdev_label_sync_list(spa, 1, txg, flags));
+ if ((error = vdev_label_sync_list(spa, 1, txg, flags)) != 0)
+ goto retry;
+
+ return (0);
}
More information about the svn-src-all
mailing list