From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Tue, 21 Jul 2020 17:32:19 +0000 (-0400)
Subject: global: Rely on fs_deinit() automatically freeing parent fs
X-Git-Tag: 2.3.13~422
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a6bbb115ab2f2281a06a7a9971a0634e8e007e3;p=thirdparty%2Fdovecot%2Fcore.git

global: Rely on fs_deinit() automatically freeing parent fs
---

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index e8b39dface..5047dbdb13 100644
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -76,7 +76,6 @@ static void fs_metawrap_free(struct fs *_fs)
 {
 	struct metawrap_fs *fs = METAWRAP_FS(_fs);
 
-	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index 594ce56359..ad2cb248c7 100644
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -202,7 +202,6 @@ static void fs_randomfail_free(struct fs *_fs)
 {
 	struct randomfail_fs *fs = RANDOMFAIL_FS(_fs);
 
-	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index d49221e86c..a95b38aa0f 100644
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -62,7 +62,6 @@ static void fs_sis_queue_free(struct fs *_fs)
 {
 	struct sis_queue_fs *fs = SISQUEUE_FS(_fs);
 
-	fs_deinit(&_fs->parent);
 	i_free(fs->queue_dir);
 	i_free(fs);
 }
diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index b3176a7603..91df2e15ae 100644
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -74,7 +74,6 @@ static void fs_sis_free(struct fs *_fs)
 {
 	struct sis_fs *fs = SIS_FS(_fs);
 
-	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index d6d07da881..dd6d76e425 100644
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -103,7 +103,6 @@ static void fs_compress_free(struct fs *_fs)
 {
 	struct compress_fs *fs = COMPRESS_FS(_fs);
 
-	fs_deinit(&_fs->parent);
 	i_free(fs);
 }
 
diff --git a/src/plugins/mail-crypt/fs-crypt-common.c b/src/plugins/mail-crypt/fs-crypt-common.c
index f0518279d5..71eb2b231a 100644
--- a/src/plugins/mail-crypt/fs-crypt-common.c
+++ b/src/plugins/mail-crypt/fs-crypt-common.c
@@ -124,7 +124,6 @@ static void fs_crypt_free(struct fs *_fs)
 	struct crypt_fs *fs = CRYPT_FS(_fs);
 
 	mail_crypt_global_keys_free(&fs->keys);
-	fs_deinit(&_fs->parent);
 	i_free(fs->enc_algo);
 	i_free(fs->set_prefix);
 	i_free(fs->public_key_path);