Re-initialize objsets when feature@project_quota is enabled

Addresses the issue of project quotas not being usable after pool
upgrade coming from an older vesion which does not support project
quotas to the one that does, analogously to how it was solved for user
quotas back in the day -- when feature@project_quota is first enabled,
re-initialize the pool's objsets.

Signed-off-by: Dušan Gvozdenović <[email protected]>
Closes #17955

Author: dusan-gvozdenovic

module/zfs/zfs_ioctl.c

@@ -3104,6 +3104,102 @@ zfs_ioc_inherit_prop(zfs_cmd_t *zc)
 	return (err);
 }
 
+static int
+zfs_userspace_upgrade_impl(const char *filesystem)
+{
+	int error = 0;
+	zfsvfs_t *zfsvfs;
+
+	if (getzfsvfs(filesystem, &zfsvfs) == 0) {
+		const boolean_t userused_enabled =
+		    dmu_objset_userused_enabled(zfsvfs->z_os);
+		const boolean_t projectquota_enabled =
+		    dmu_objset_projectquota_enabled(zfsvfs->z_os);
+
+		if (!userused_enabled || !projectquota_enabled) {
+			/*
+			 * If userused/projectquota is not enabled, it may be
+			 * because the objset needs to be closed & reopened (to
+			 * grow the objset_phys_t). Suspend/resume the fs will
+			 * do that.
+			 */
+			dsl_dataset_t *ds, *newds;
+
+			ds = dmu_objset_ds(zfsvfs->z_os);
+			error = zfs_suspend_fs(zfsvfs);
+			if (error == 0) {
+				dmu_objset_refresh_ownership(ds, &newds,
+				    B_TRUE, zfsvfs);
+				error = zfs_resume_fs(zfsvfs, newds);
+			}
+		}
+		if (error == 0) {
+			mutex_enter(&zfsvfs->z_os->os_upgrade_lock);
+			if (zfsvfs->z_os->os_upgrade_id == 0) {
+				/* clear potential error code and retry */
+				zfsvfs->z_os->os_upgrade_status = 0;
+				mutex_exit(&zfsvfs->z_os->os_upgrade_lock);
+
+				dsl_pool_config_enter(
+				    dmu_objset_pool(zfsvfs->z_os), FTAG);
+				if (!userused_enabled)
+					dmu_objset_userspace_upgrade(
+					    zfsvfs->z_os);
+				if (!projectquota_enabled)
+					dmu_objset_id_quota_upgrade(
+					    zfsvfs->z_os);
+				dsl_pool_config_exit(
+				    dmu_objset_pool(zfsvfs->z_os), FTAG);
+			} else {
+				mutex_exit(&zfsvfs->z_os->os_upgrade_lock);
+			}
+
+			taskq_wait_id(zfsvfs->z_os->os_spa->spa_upgrade_taskq,
+			    zfsvfs->z_os->os_upgrade_id);
+			error = zfsvfs->z_os->os_upgrade_status;
+		}
+		zfs_vfs_rele(zfsvfs);
+	} else {
+		objset_t *os;
+
+		/* XXX kind of reading contents without owning */
+		error = dmu_objset_hold_flags(filesystem, B_TRUE, FTAG, &os);
+		if (error != 0)
+			return (error);
+
+		mutex_enter(&os->os_upgrade_lock);
+		if (os->os_upgrade_id == 0) {
+			/* clear potential error code and retry */
+			os->os_upgrade_status = 0;
+			mutex_exit(&os->os_upgrade_lock);
+
+			dmu_objset_userspace_upgrade(os);
+			dmu_objset_id_quota_upgrade(os);
+		} else {
+			mutex_exit(&os->os_upgrade_lock);
+		}
+
+		dsl_pool_rele(dmu_objset_pool(os), FTAG);
+
+		taskq_wait_id(os->os_spa->spa_upgrade_taskq, os->os_upgrade_id);
+		error = os->os_upgrade_status;
+
+		dsl_dataset_rele_flags(dmu_objset_ds(os), DS_HOLD_FLAG_DECRYPT,
+		    FTAG);
+	}
+
+	return (error);
+}
+
+
+
+static int
+zfs_userspace_upgrade_cb(const char *dataset, void *arg)
+{
+	(void) arg;
+	return (zfs_userspace_upgrade_impl(dataset));
+}
+
 static int
 zfs_ioc_pool_set_props(zfs_cmd_t *zc)
 {
@@ -3143,6 +3239,10 @@ zfs_ioc_pool_set_props(zfs_cmd_t *zc)
 
 	error = spa_prop_set(spa, props);
 
+	if ((error == 0) && nvlist_exists(props, "feature@project_quota"))
+		error = dmu_objset_find(spa_name(spa), zfs_userspace_upgrade_cb,
+		    NULL, DS_FIND_CHILDREN);
+
 	nvlist_free(props);
 	spa_close(spa, FTAG);
 
@@ -6404,75 +6504,7 @@ zfs_ioc_userspace_many(zfs_cmd_t *zc)
 static int
 zfs_ioc_userspace_upgrade(zfs_cmd_t *zc)
 {
-	int error = 0;
-	zfsvfs_t *zfsvfs;
-
-	if (getzfsvfs(zc->zc_name, &zfsvfs) == 0) {
-		if (!dmu_objset_userused_enabled(zfsvfs->z_os)) {
-			/*
-			 * If userused is not enabled, it may be because the
-			 * objset needs to be closed & reopened (to grow the
-			 * objset_phys_t).  Suspend/resume the fs will do that.
-			 */
-			dsl_dataset_t *ds, *newds;
-
-			ds = dmu_objset_ds(zfsvfs->z_os);
-			error = zfs_suspend_fs(zfsvfs);
-			if (error == 0) {
-				dmu_objset_refresh_ownership(ds, &newds,
-				    B_TRUE, zfsvfs);
-				error = zfs_resume_fs(zfsvfs, newds);
-			}
-		}
-		if (error == 0) {
-			mutex_enter(&zfsvfs->z_os->os_upgrade_lock);
-			if (zfsvfs->z_os->os_upgrade_id == 0) {
-				/* clear potential error code and retry */
-				zfsvfs->z_os->os_upgrade_status = 0;
-				mutex_exit(&zfsvfs->z_os->os_upgrade_lock);
-
-				dsl_pool_config_enter(
-				    dmu_objset_pool(zfsvfs->z_os), FTAG);
-				dmu_objset_userspace_upgrade(zfsvfs->z_os);
-				dsl_pool_config_exit(
-				    dmu_objset_pool(zfsvfs->z_os), FTAG);
-			} else {
-				mutex_exit(&zfsvfs->z_os->os_upgrade_lock);
-			}
-
-			taskq_wait_id(zfsvfs->z_os->os_spa->spa_upgrade_taskq,
-			    zfsvfs->z_os->os_upgrade_id);
-			error = zfsvfs->z_os->os_upgrade_status;
-		}
-		zfs_vfs_rele(zfsvfs);
-	} else {
-		objset_t *os;
-
-		/* XXX kind of reading contents without owning */
-		error = dmu_objset_hold_flags(zc->zc_name, B_TRUE, FTAG, &os);
-		if (error != 0)
-			return (error);
-
-		mutex_enter(&os->os_upgrade_lock);
-		if (os->os_upgrade_id == 0) {
-			/* clear potential error code and retry */
-			os->os_upgrade_status = 0;
-			mutex_exit(&os->os_upgrade_lock);
-
-			dmu_objset_userspace_upgrade(os);
-		} else {
-			mutex_exit(&os->os_upgrade_lock);
-		}
-
-		dsl_pool_rele(dmu_objset_pool(os), FTAG);
-
-		taskq_wait_id(os->os_spa->spa_upgrade_taskq, os->os_upgrade_id);
-		error = os->os_upgrade_status;
-
-		dsl_dataset_rele_flags(dmu_objset_ds(os), DS_HOLD_FLAG_DECRYPT,
-		    FTAG);
-	}
-	return (error);
+	return (zfs_userspace_upgrade_impl(zc->zc_name));
 }
 
 /*