From: Timo Sirainen <tss@iki.fi>
Date: Wed, 17 Jun 2015 09:22:17 +0000 (+0300)
Subject: lib-fs: Removed redundant o_stream_nfinish() calls
X-Git-Tag: 2.2.19.rc1~320
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30605b7bd82acb92cca47b080636757bf9d02a73;p=thirdparty%2Fdovecot%2Fcore.git

lib-fs: Removed redundant o_stream_nfinish() calls
---

diff --git a/src/lib-fs/fs-posix.c b/src/lib-fs/fs-posix.c
index ee2ce0a4d7..d8b39ee891 100644
--- a/src/lib-fs/fs-posix.c
+++ b/src/lib-fs/fs-posix.c
@@ -47,7 +47,6 @@ struct posix_fs_file {
 
 	bool seek_to_beginning;
 	bool success;
-	bool open_failed;
 };
 
 struct posix_fs_lock {
@@ -475,7 +474,6 @@ static void fs_posix_write_stream(struct fs_file *_file)
 	} else if (file->fd == -1 && fs_posix_open(file) < 0) {
 		_file->output = o_stream_create_error_str(errno, "%s",
 			fs_file_last_error(_file));
-		file->open_failed = TRUE;
 	} else {
 		_file->output = o_stream_create_fd_file(file->fd,
 							(uoff_t)-1, FALSE);
@@ -488,14 +486,6 @@ static int fs_posix_write_stream_finish(struct fs_file *_file, bool success)
 	struct posix_fs_file *file = (struct posix_fs_file *)_file;
 	int ret = success ? 0 : -1;
 
-	if (file->open_failed)
-		ret = -1;
-	else if (o_stream_nfinish(_file->output) < 0) {
-		fs_set_error(_file->fs, "write(%s) failed: %s",
-			     o_stream_get_name(_file->output),
-			     o_stream_get_error(_file->output));
-		ret = -1;
-	}
 	o_stream_destroy(&_file->output);
 
 	switch (file->open_mode) {
diff --git a/src/lib-fs/fs-randomfail.c b/src/lib-fs/fs-randomfail.c
index c721c818f4..c7ae8972ee 100644
--- a/src/lib-fs/fs-randomfail.c
+++ b/src/lib-fs/fs-randomfail.c
@@ -382,12 +382,6 @@ static int fs_randomfail_write_stream_finish(struct fs_file *_file, bool success
 	struct randomfail_fs_file *file = (struct randomfail_fs_file *)_file;
 
 	if (_file->output != NULL) {
-		if (o_stream_nfinish(_file->output) < 0) {
-			fs_set_error(_file->fs, "write(%s) failed: %s",
-				     o_stream_get_name(_file->output),
-				     o_stream_get_error(_file->output));
-			success = FALSE;
-		}
 		if (_file->output == file->super_output)
 			_file->output = NULL;
 		else
diff --git a/src/lib-fs/fs-sis.c b/src/lib-fs/fs-sis.c
index ef754db32c..cf975dadc8 100644
--- a/src/lib-fs/fs-sis.c
+++ b/src/lib-fs/fs-sis.c
@@ -375,8 +375,6 @@ static int fs_sis_write_stream_finish(struct fs_file *_file, bool success)
 {
 	struct sis_fs_file *file = (struct sis_fs_file *)_file;
 
-	if (o_stream_nfinish(_file->output) < 0)
-		success = FALSE;
 	if (!success) {
 		if (file->super != NULL) {
 			fs_write_stream_abort(file->super, &file->fs_output);