lib-fs: Do not abort parent of parent

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index f2d4acb3464682b7692f996a374a78989c7efa00..9110c9202e5eb5c063032d134e0bc46048d3cff8 100644 (file)
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -365,7 +365,7 @@ static int fs_metawrap_write_stream_finish(struct fs_file *_file, bool success)
                if (file->super_output != NULL) {
                        /* no metawrap */
                        i_assert(file->temp_output == NULL);
-                       fs_write_stream_abort_parent(_file->parent, &file->super_output);
+                       fs_write_stream_abort_parent(_file, &file->super_output);
                } else {
                        i_assert(file->temp_output != NULL);
                        o_stream_destroy(&file->temp_output);

diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index 443ea9fc40d91753aade0fcbe0c3ed2ac1ca1363..4c90d34e4baa524d1c2d6ed4903152c3d9bf7c9e 100644 (file)
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -404,7 +404,7 @@ static int fs_randomfail_write_stream_finish(struct fs_file *_file, bool success
                else
                        o_stream_unref(&_file->output);
                if (!success) {
-                       fs_write_stream_abort_parent(_file->parent, &file->super_output);
+                       fs_write_stream_abort_parent(_file, &file->super_output);
                        return -1;
                }
                if (!fs_random_fail(_file->fs, 1, FS_OP_WRITE)) {

diff --git a/src/lib-fs/fs-sis-queue.c b/src/lib-fs/fs-sis-queue.c
index a317a9aa830de3fb09ea3d0f7f1cc1990926aa2e..174420be43dde5c8d5ff546da1effaef9d040a70 100644 (file)
--- a/src/lib-fs/fs-sis-queue.c
+++ b/src/lib-fs/fs-sis-queue.c
@@ -149,7 +149,7 @@ static int fs_sis_queue_write_stream_finish(struct fs_file *_file, bool success)
 
        if (!success) {
                if (_file->parent != NULL)
-                       fs_write_stream_abort_parent(_file->parent, &_file->output);
+                       fs_write_stream_abort_parent(_file, &_file->output);
                return -1;
        }
 

diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index a806fa5609532eb0f5be0d7ced198a5d2ebc4c91..83783215ba4c6db4536e286fdd072857b3eb5184 100644 (file)
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -287,7 +287,7 @@ static int fs_sis_write_stream_finish(struct fs_file *_file, bool success)
 
        if (!success) {
                if (_file->parent != NULL)
-                       fs_write_stream_abort_parent(_file->parent, &file->fs_output);
+                       fs_write_stream_abort_parent(_file, &file->fs_output);
                o_stream_unref(&_file->output);
                return -1;
        }
@@ -297,7 +297,7 @@ static int fs_sis_write_stream_finish(struct fs_file *_file, bool success)
            i_stream_is_eof(file->hash_input)) {
                o_stream_unref(&_file->output);
                if (fs_sis_try_link(file)) {
-                       fs_write_stream_abort_parent(_file->parent, &file->fs_output);
+                       fs_write_stream_abort_parent(_file, &file->fs_output);
                        return 1;
                }
        }

diff --git a/src/lib-fs/fs-wrapper.c b/src/lib-fs/fs-wrapper.c
index ee1f8aab4d5f87c5a9d2e64cdc6f69b3aa129ac3..820142052d6dde89f50e4f07ee687449a6260008 100644 (file)
--- a/src/lib-fs/fs-wrapper.c
+++ b/src/lib-fs/fs-wrapper.c
@@ -79,7 +79,7 @@ void fs_wrapper_write_stream(struct fs_file *file)
 int fs_wrapper_write_stream_finish(struct fs_file *file, bool success)
 {
        if (!success) {
-               fs_write_stream_abort_parent(file->parent, &file->output);
+               fs_write_stream_abort_parent(file, &file->output);
                return -1;
        }
 

diff --git a/src/plugins/fs-compress/fs-compress.c b/src/plugins/fs-compress/fs-compress.c
index 5d6e527ed03cde6ade13fc7ee839b2728e4cade5..108c4dffe99e18cc312974e870f97c0ca9752717 100644 (file)
--- a/src/plugins/fs-compress/fs-compress.c
+++ b/src/plugins/fs-compress/fs-compress.c
@@ -201,7 +201,7 @@ static int fs_compress_write_stream_finish(struct fs_file *_file, bool success)
                if (file->temp_output != NULL)
                        o_stream_destroy(&file->temp_output);
                if (file->super_output != NULL)
-                       fs_write_stream_abort_parent(_file->parent, &file->super_output);
+                       fs_write_stream_abort_parent(_file, &file->super_output);
                return -1;
        }