picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fileio: move fsync() logic into write_string_stream_ts() 

That way, write_string_stream_ts() becomes more powerful, and we can
remove duplicate code from  write_string_file_atomic() and
write_string_file_ts().
This commit is contained in:
Lennart Poettering 2017-09-22 20:59:39 +02:00
parent b183713383
commit 9dd1b1e869
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/basic/fileio.c
View File

@ -72,7 +72,10 @@ int write_string_stream_ts(
return -errno;
}
return fflush_and_check(f);
if (flags & WRITE_STRING_FILE_SYNC)
return fflush_sync_and_check(f);
else
return fflush_and_check(f);
}
static int write_string_file_atomic(
@ -95,16 +98,18 @@ static int write_string_file_atomic(
(void) fchmod_umask(fileno(f), 0644);
r = write_string_stream_ts(f, line, flags, ts);
if (r >= 0 && (flags & WRITE_STRING_FILE_SYNC))
r = fflush_sync_and_check(f);
if (r >= 0) {
if (rename(p, fn) < 0)
r = -errno;
if (r < 0)
goto fail;
if (rename(p, fn) < 0) {
r = -errno;
goto fail;
}
if (r < 0)
(void) unlink(p);
return 0;
fail:
(void) unlink(p);
return r;
}
@ -163,12 +168,6 @@ int write_string_file_ts(
if (r < 0)
goto fail;
if (flags & WRITE_STRING_FILE_SYNC) {
r = fflush_sync_and_check(f);
if (r < 0)
return r;
}
return 0;
fail: