From cfb4971cccca2ef18a45e7a5d3e5069c90df9422 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Wed, 31 Aug 2016 09:20:49 +0300 Subject: [PATCH] lib-fs: Do not abort parent of parent --- src/lib-fs/fs-metawrap.c | 2 +- src/lib-fs/fs-randomfail.c | 2 +- src/lib-fs/fs-sis-queue.c | 2 +- src/lib-fs/fs-sis.c | 4 ++-- src/lib-fs/fs-wrapper.c | 2 +- src/plugins/fs-compress/fs-compress.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c index f2d4acb346..9110c9202e 100644 --- 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 443ea9fc40..4c90d34e4b 100644 --- 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 a317a9aa83..174420be43 100644 --- 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 a806fa5609..83783215ba 100644 --- 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 ee1f8aab4d..820142052d 100644 --- 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 5d6e527ed0..108c4dffe9 100644 --- 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; }