From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 29 Nov 2019 14:55:42 +0000 (+0200)
Subject: lib-fs: Move file deinit code from fs_file_deinit() to fs_file_free()
X-Git-Tag: 2.3.10~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7aaef05770613284e0dd54f95f183f6f029fbde;p=thirdparty%2Fdovecot%2Fcore.git

lib-fs: Move file deinit code from fs_file_deinit() to fs_file_free()
---

diff --git a/src/lib-fs/fs-api.c b/src/lib-fs/fs-api.c
index 700c6aacc7..61b3bacd17 100644
--- a/src/lib-fs/fs-api.c
+++ b/src/lib-fs/fs-api.c
@@ -288,15 +288,10 @@ struct fs_file *fs_file_init_with_event(struct fs *fs, struct event *event,
 void fs_file_deinit(struct fs_file **_file)
 {
 	struct fs_file *file = *_file;
-	struct event *event;
-	pool_t metadata_pool;
 
 	if (file == NULL)
 		return;
 
-	event = file->event;
-	metadata_pool = file->metadata_pool;
-
 	i_assert(file->fs->files_open_count > 0);
 
 	*_file = NULL;
@@ -308,15 +303,13 @@ void fs_file_deinit(struct fs_file **_file)
 	T_BEGIN {
 		file->fs->v.file_deinit(file);
 	} T_END;
-
-	event_unref(&event);
-	if (metadata_pool != NULL)
-		pool_unref(&metadata_pool);
 }
 
 void fs_file_free(struct fs_file *file)
 {
 	fs_file_deinit(&file->parent);
+	event_unref(&file->event);
+	pool_unref(&file->metadata_pool);
 }
 
 void fs_file_close(struct fs_file *file)