From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 28 Jul 2023 12:52:28 +0000 (+0300)
Subject: fs-metawrap: Implement new init() API
X-Git-Tag: 2.4.1~1399
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9946718b08bdb78c28456ccb8a6ef74cbdcdb62b;p=thirdparty%2Fdovecot%2Fcore.git

fs-metawrap: Implement new init() API
---

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index ff0afd91be..f7b8bcf02d 100644
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -46,8 +46,21 @@ static struct fs *fs_metawrap_alloc(void)
 }
 
 static int
-fs_metawrap_init(struct fs *_fs, const char *args,
-		 const struct fs_parameters *params, const char **error_r)
+fs_metawrap_init(struct fs *_fs, const struct fs_parameters *params,
+		 const char **error_r)
+{
+	struct metawrap_fs *fs = METAWRAP_FS(_fs);
+	if (fs_init_parent(_fs, params, error_r) < 0)
+		return -1;
+	if ((fs_get_properties(_fs->parent) & FS_PROPERTY_METADATA) == 0)
+		fs->wrap_metadata = TRUE;
+	return 0;
+}
+
+static int
+fs_metawrap_legacy_init(struct fs *_fs, const char *args,
+			const struct fs_parameters *params,
+			const char **error_r)
 {
 	struct metawrap_fs *fs = METAWRAP_FS(_fs);
 	const char *parent_name, *parent_args;
@@ -499,7 +512,8 @@ const struct fs fs_class_metawrap = {
 	.name = "metawrap",
 	.v = {
 		.alloc = fs_metawrap_alloc,
-		.legacy_init = fs_metawrap_init,
+		.init = fs_metawrap_init,
+		.legacy_init = fs_metawrap_legacy_init,
 		.deinit = NULL,
 		.free = fs_metawrap_free,
 		.get_properties = fs_metawrap_get_properties,