Mercurial > dovecot > core-2.2

changeset 20692:914bc37e32bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-fs: Do not abort parent of parent
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Wed, 31 Aug 2016 09:20:49 +0300
parents 45db0080ece6
children fa67f1a329da
files src/lib-fs/fs-metawrap.c src/lib-fs/fs-randomfail.c src/lib-fs/fs-sis-queue.c src/lib-fs/fs-sis.c src/lib-fs/fs-wrapper.c src/plugins/fs-compress/fs-compress.c
diffstat 6 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-fs/fs-metawrap.c	Sun Aug 28 18:40:01 2016 +0300
+++ b/src/lib-fs/fs-metawrap.c	Wed Aug 31 09:20:49 2016 +0300
@@ -365,7 +365,7 @@
 		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);
--- a/src/lib-fs/fs-randomfail.c	Sun Aug 28 18:40:01 2016 +0300
+++ b/src/lib-fs/fs-randomfail.c	Wed Aug 31 09:20:49 2016 +0300
@@ -404,7 +404,7 @@
 		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)) {
--- a/src/lib-fs/fs-sis-queue.c	Sun Aug 28 18:40:01 2016 +0300
+++ b/src/lib-fs/fs-sis-queue.c	Wed Aug 31 09:20:49 2016 +0300
@@ -149,7 +149,7 @@
 
 	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;
 	}
 
--- a/src/lib-fs/fs-sis.c	Sun Aug 28 18:40:01 2016 +0300
+++ b/src/lib-fs/fs-sis.c	Wed Aug 31 09:20:49 2016 +0300
@@ -287,7 +287,7 @@
 
 	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 @@
 	    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;
 		}
 	}
--- a/src/lib-fs/fs-wrapper.c	Sun Aug 28 18:40:01 2016 +0300
+++ b/src/lib-fs/fs-wrapper.c	Wed Aug 31 09:20:49 2016 +0300
@@ -79,7 +79,7 @@
 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;
 	}
 
--- a/src/plugins/fs-compress/fs-compress.c	Sun Aug 28 18:40:01 2016 +0300
+++ b/src/plugins/fs-compress/fs-compress.c	Wed Aug 31 09:20:49 2016 +0300
@@ -201,7 +201,7 @@
 		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;
 	}