1 This patch from Sami Farin lets you specify --fsync if you want fsync()
2 to be called on every file we write.
4 To use this patch, run these commands for a successful build:
6 patch -p1 <patches/fsync.diff
7 ./configure (optional if already run)
10 based-on: d73762eea3f15f2c56bb3fa9394ad1883c25c949
11 diff --git a/options.c b/options.c
14 @@ -50,6 +50,7 @@ int append_mode = 0;
15 int keep_dirlinks = 0;
16 int copy_dirlinks = 0;
19 int preserve_links = 0;
20 int preserve_hard_links = 0;
21 int preserve_acls = 0;
22 @@ -748,6 +749,7 @@ void usage(enum logcode F)
23 rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
24 rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
25 rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
26 + rprintf(F," --fsync fsync every written file\n");
27 rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
28 rprintf(F," --usermap=STRING custom username mapping\n");
29 rprintf(F," --groupmap=STRING custom groupname mapping\n");
30 @@ -1017,6 +1019,7 @@ static struct poptOption long_options[] = {
31 {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 },
32 {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 },
33 {"no-contimeout", 0, POPT_ARG_VAL, &connect_timeout, 0, 0, 0 },
34 + {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
35 {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
36 {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
37 {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
38 @@ -2746,6 +2749,9 @@ void server_options(char **args, int *argc_p)
43 + args[ac++] = "--fsync";
46 /* the server only needs this option if it is not the sender,
47 * and it may be an older version that doesn't know this
48 diff --git a/receiver.c b/receiver.c
51 @@ -40,6 +40,7 @@ extern int relative_paths;
52 extern int preserve_hard_links;
53 extern int preserve_perms;
54 extern int preserve_xattrs;
56 extern int basis_dir_cnt;
57 extern int make_backups;
58 extern int cleanup_got_literal;
59 @@ -390,6 +391,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
61 sum_len = sum_end(file_sum1);
63 + if (do_fsync && fd != -1 && fsync(fd) != 0) {
64 + rsyserr(FERROR, errno, "fsync failed on %s",
66 + exit_cleanup(RERR_FILEIO);
72 diff --git a/t_stub.c b/t_stub.c
81 int modify_window = 0;
82 int preallocate_files = 0;
83 diff --git a/util.c b/util.c
91 extern int protect_args;
92 extern int modify_window;
93 extern int relative_paths;
94 @@ -414,6 +415,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
95 rsyserr(FERROR_XFER, errno, "ftruncate %s", full_fname(dest));
98 + if (do_fsync && fsync(ofd) < 0) {
99 + rsyserr(FERROR, errno, "fsync failed on %s",
105 if (close(ofd) < 0) {
106 int save_errno = errno;
107 rsyserr(FERROR_XFER, errno, "close failed on %s",