D44095.diff
No OneTemporary
Actions

Size

1009 B

Referenced Files

None

Subscribers

None

D44095.diff
View Options

	diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c
	--- a/stand/libsa/zfs/zfsimpl.c
	+++ b/stand/libsa/zfs/zfsimpl.c
	@@ -1681,14 +1681,14 @@
	vdev_write_bootenv_impl(vdev_t vdev, vdev_boot_envblock_t be)
	{
	vdev_t *kid;
	- int rv = 0, rc;
	+ int rv = 0, err;

	STAILQ_FOREACH(kid, &vdev->v_children, v_childlink) {
	if (kid->v_state != VDEV_STATE_HEALTHY)
	continue;
	- rc = vdev_write_bootenv_impl(kid, be);
	- if (rv != 0)
	- rv = rc;
	+ err = vdev_write_bootenv_impl(kid, be);
	+ if (err != 0)
	+ rv = err;
	}

	/*
	@@ -1698,12 +1698,12 @@
	return (rv);

	for (int l = 0; l < VDEV_LABELS; l++) {
	- rc = vdev_label_write(vdev, l, be,
	+ err = vdev_label_write(vdev, l, be,
	offsetof(vdev_label_t, vl_be));
	- if (rc != 0) {
	+ if (err != 0) {
	printf("failed to write bootenv to %s label %d: %d\n",
	- vdev->v_name ? vdev->v_name : "unknown", l, rc);
	- rv = rc;
	+ vdev->v_name ? vdev->v_name : "unknown", l, err);
	+ rv = err;
	}
	}
	return (rv);