1 This patch from Sami Farin lets you specify --fsync if you want fsync()
2 to be called on every file we write.
6 @@ -43,6 +43,7 @@ int append_mode = 0;
11 int preserve_links = 0;
12 int preserve_hard_links = 0;
13 int preserve_perms = 0;
14 @@ -329,6 +330,7 @@ void usage(enum logcode F)
15 rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
16 rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
17 rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
18 + rprintf(F," --fsync fsync every written file\n");
19 rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
20 rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
21 rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
22 @@ -504,6 +506,7 @@ static struct poptOption long_options[]
23 {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
24 {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
25 {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
26 + {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
27 {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
28 {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
29 {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
30 @@ -1705,6 +1708,9 @@ void server_options(char **args,int *arg
34 + if (do_fsync && am_sender)
35 + args[ac++] = "--fsync";
37 if (basis_dir[0] && am_sender) {
38 /* the server only needs this option if it is not the sender,
39 * and it may be an older version that doesn't know this
42 @@ -36,6 +36,7 @@ extern int protocol_version;
43 extern int relative_paths;
44 extern int preserve_hard_links;
45 extern int preserve_perms;
47 extern int basis_dir_cnt;
48 extern int make_backups;
49 extern int cleanup_got_literal;
50 @@ -252,6 +253,12 @@ static int receive_data(int f_in, char *
51 exit_cleanup(RERR_FILEIO);
54 + if (do_fsync && fd != -1 && fsync(fd) != 0) {
55 + rsyserr(FERROR, errno, "fsync failed on %s",
57 + exit_cleanup(RERR_FILEIO);
66 * functions, so that module test harnesses can run standalone.
70 int modify_window = 0;
72 int relative_paths = 0;
80 extern int modify_window;
81 extern int relative_paths;
82 extern int human_readable;
83 @@ -319,6 +320,12 @@ int copy_file(const char *source, const
87 + if (do_fsync && fsync(ofd) < 0) {
88 + rsyserr(FERROR, errno, "fsync failed on %s",