upstream/illumos/illumos-gate: comparison usr/src/lib/libzfs/common/libzfs

equal deleted inserted replaced

-:81f1af42bafc
+:f9b7933f3770
 	if (zhp->zfs_mntopts)
 		free(zhp->zfs_mntopts);
 	nvlist_free(zhp->zfs_props);
 	nvlist_free(zhp->zfs_user_props);
 	free(zhp);
+}
+int
+zfs_spa_version(zfs_handle_t *zhp, int *spa_version)
+{
+	char *pool_name;
+	zpool_handle_t *zpool_handle;
+	char *p;
+	pool_name = zfs_alloc(zhp->zfs_hdl, MAXPATHLEN);
+	if (zfs_prop_get(zhp, ZFS_PROP_NAME, pool_name,
+	    MAXPATHLEN, NULL, NULL, 0, B_FALSE) != 0) {
+		free(pool_name);
+		return (-1);
+	}
+	if (p = strchr(pool_name, '/'))
+		*p = '\0';
+	zpool_handle = zpool_open(zhp->zfs_hdl, pool_name);
+	free(pool_name);
+	if (zpool_handle == NULL)
+		return (-1);
+	*spa_version = zpool_get_prop_int(zpool_handle,
+	    ZPOOL_PROP_VERSION, NULL);
+	zpool_close(zpool_handle);
+	return (0);
+}
+/*
+* The choice of reservation property depends on the SPA version.
+*/
+static int
+zfs_which_resv_prop(zfs_handle_t *zhp, zfs_prop_t *resv_prop)
+{
+	int spa_version;
+	if (zfs_spa_version(zhp, &spa_version) < 0)
+		return (-1);
+	if (spa_version >= SPA_VERSION_REFRESERVATION)
+		*resv_prop = ZFS_PROP_REFRESERVATION;
+	else
+		*resv_prop = ZFS_PROP_RESERVATION;
+	return (0);
 }
 /*
 * Given an nvlist of properties to set, validates that they are correct, and
 * parses any numeric properties (index, boolean, etc) if they are specified as
 	    &intval) == 0) {
 		uint64_t old_volsize = zfs_prop_get_int(zhp,
 		    ZFS_PROP_VOLSIZE);
 		uint64_t old_reservation;
 		uint64_t new_reservation;
-		char *pool_name;
-		zpool_handle_t *zpool_handle;
-		char *p;
 		zfs_prop_t resv_prop;
-		uint64_t spa_version;
+		if (zfs_which_resv_prop(zhp, &resv_prop) < 0)
-		pool_name = zfs_alloc(zhp->zfs_hdl, MAXPATHLEN);
-		if (zfs_prop_get(zhp, ZFS_PROP_NAME, pool_name,
-		    MAXPATHLEN, NULL, NULL, 0, B_FALSE) != 0) {
-			free(pool_name);
 			goto error;
-		}
-		if (p = strchr(pool_name, '/'))
-			*p = '\0';
-		zpool_handle = zpool_open(hdl, pool_name);
-		free(pool_name);
-		if (zpool_handle == NULL)
-			goto error;
-		spa_version = zpool_get_prop_int(zpool_handle,
-		    ZPOOL_PROP_VERSION, NULL);
-		zpool_close(zpool_handle);
-		if (spa_version >= SPA_VERSION_REFRESERVATION)
-			resv_prop = ZFS_PROP_REFRESERVATION;
-		else
-			resv_prop = ZFS_PROP_RESERVATION;
 		old_reservation = zfs_prop_get_int(zhp, resv_prop);
 		if (old_volsize == old_reservation &&
 		    nvlist_lookup_uint64(ret, zfs_prop_to_name(resv_prop),
 		    &new_reservation) != 0) {
 				(void) no_memory(hdl);
 				goto error;
 			}
 		}
 	}
 	return (ret);
 error:
 	nvlist_free(ret);
 	return (NULL);
 	if (zcmd_write_src_nvlist(hdl, &zc, nvl) != 0)
 		goto error;
 	ret = zfs_ioctl(hdl, ZFS_IOC_SET_PROP, &zc);
 	if (ret != 0) {
 		switch (errno) {
 		case ENOSPC:
 			/*
 	(void) get_numeric_property(zhp, prop, NULL, &source, &val);
 	return (val);
 }
+int
+zfs_prop_set_int(zfs_handle_t *zhp, zfs_prop_t prop, uint64_t val)
+{
+	char buf[64];
+	zfs_nicenum(val, buf, sizeof (buf));
+	return (zfs_prop_set(zhp, zfs_prop_to_name(prop), buf));
+}
 /*
 * Similar to zfs_prop_get(), but returns the value as an integer.
 */
 int
 zfs_prop_get_numeric(zfs_handle_t *zhp, zfs_prop_t prop, uint64_t *value,
 zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap)
 {
 	rollback_data_t cb = { 0 };
 	int err;
 	zfs_cmd_t zc = { 0 };
+	boolean_t restore_resv = 0;
+	uint64_t old_volsize, new_volsize;
+	zfs_prop_t resv_prop;
 	assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
 	    zhp->zfs_type == ZFS_TYPE_VOLUME);
 	/*
 	/*
 	 * Now that we have verified that the snapshot is the latest,
 	 * rollback to the given snapshot.
 	 */
-	if (zhp->zfs_type == ZFS_TYPE_VOLUME &&
+	if (zhp->zfs_type == ZFS_TYPE_VOLUME) {
-	    zvol_remove_link(zhp->zfs_hdl, zhp->zfs_name) != 0)
+		if (zvol_remove_link(zhp->zfs_hdl, zhp->zfs_name) != 0)
-		return (-1);
+			return (-1);
+		if (zfs_which_resv_prop(zhp, &resv_prop) < 0)
+			return (-1);
+		old_volsize = zfs_prop_get_int(zhp, ZFS_PROP_VOLSIZE);
+		restore_resv =
+		    (old_volsize == zfs_prop_get_int(zhp, resv_prop));
+	}
 	(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
 	if (ZFS_IS_VOLUME(zhp))
 		zc.zc_objset_type = DMU_OST_ZVOL;
 	 * We rely on zfs_iter_children() to verify that there are no
 	 * newer snapshots for the given dataset.  Therefore, we can
 	 * simply pass the name on to the ioctl() call.  There is still
 	 * an unlikely race condition where the user has taken a
 	 * snapshot since we verified that this was the most recent.
+	 *
 	 */
 	if ((err = zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_ROLLBACK, &zc)) != 0) {
 		(void) zfs_standard_error_fmt(zhp->zfs_hdl, errno,
 		    dgettext(TEXT_DOMAIN, "cannot rollback '%s'"),
 		    zhp->zfs_name);
 	} else if (zhp->zfs_type == ZFS_TYPE_VOLUME) {
+	/*
+	 * For volumes, if the pre-rollback volsize matched the pre-
+	 * rollback reservation and the volsize has changed then set
+	 * the reservation property to the post-rollback volsize.
+	 * Make a new handle since the rollback closed the dataset.
+	 */
+		zhp = make_dataset_handle(zhp->zfs_hdl, zhp->zfs_name);
+		if (!zhp)
+			return (err);
+		if (restore_resv) {
+			new_volsize = zfs_prop_get_int(zhp, ZFS_PROP_VOLSIZE);
+			if (old_volsize != new_volsize)
+				zfs_prop_set_int(zhp, resv_prop, new_volsize);
+		}
 		err = zvol_create_link(zhp->zfs_hdl, zhp->zfs_name);
-	}
+		zfs_close(zhp);
+	}
 	return (err);
 }
 /*
 * Iterate over all dependents for a given dataset.  This includes both

changeset 5713	f9b7933f3770
parent 5592	1b20f93ffca0
child 5717	b163be0bb014