This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 13 May 2004 19:01:45 -0000
-@@ -37,6 +37,7 @@ int make_backups = 0;
- **/
- int whole_file = -1;
-
-+int do_fsync = 0;
- int archive_mode = 0;
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/fsync.diff
+ ./configure (optional if already run)
+ make
+
+--- old/options.c
++++ new/options.c
+@@ -44,6 +44,7 @@ int append_mode = 0;
+ int keep_dirlinks = 0;
+ int copy_dirlinks = 0;
int copy_links = 0;
++int do_fsync = 0;
int preserve_links = 0;
-@@ -230,6 +231,7 @@ void usage(enum logcode F)
- rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
- rprintf(F," --backup-dir make backups into this directory\n");
- rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
+ int preserve_hard_links = 0;
+ int preserve_acls = 0;
+@@ -366,6 +367,7 @@ void usage(enum logcode F)
+ rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
+ rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
+ rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
+ rprintf(F," --fsync fsync every written file\n");
- rprintf(F," -u, --update update only (don't overwrite newer files)\n");
- rprintf(F," -l, --links copy symlinks as symlinks\n");
- rprintf(F," -L, --copy-links copy the referent of all symlinks\n");
-@@ -332,6 +334,7 @@ static struct poptOption long_options[]
- {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
- {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
- {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
+ rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
+ rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
+ rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
+@@ -567,6 +569,7 @@ static struct poptOption long_options[]
+ {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
+ {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
+ {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
+ {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
- {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 },
- {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
- {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 },
-@@ -943,6 +946,9 @@ void server_options(char **args,int *arg
- args[ac++] = "--temp-dir";
- args[ac++] = tmpdir;
- }
-+
-+ if (do_fsync && am_sender)
-+ args[ac++] = "--fsync";
+ {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
+ {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
+ {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
+@@ -1869,6 +1872,9 @@ void server_options(char **args,int *arg
+ args[ac++] = tmpdir;
+ }
- if (compare_dest && am_sender) {
- /* the server only needs this option if it is not the sender,
---- receiver.c 13 May 2004 07:08:22 -0000 1.77
-+++ receiver.c 13 May 2004 19:01:46 -0000
-@@ -46,6 +46,7 @@ extern int module_id;
- extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
++ if (do_fsync)
++ args[ac++] = "--fsync";
++
+ if (basis_dir[0]) {
+ /* the server only needs this option if it is not the sender,
+ * and it may be an older version that doesn't know this
+--- old/receiver.c
++++ new/receiver.c
+@@ -39,6 +39,7 @@ extern int relative_paths;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int preserve_xattrs;
+extern int do_fsync;
+ extern int basis_dir_cnt;
+ extern int make_backups;
+ extern int cleanup_got_literal;
+@@ -259,6 +260,12 @@ static int receive_data(int f_in, char *
+ exit_cleanup(RERR_FILEIO);
+ }
- static void delete_one(char *fn, int is_dir)
- {
-@@ -265,6 +266,12 @@ static int receive_data(int f_in,struct
-
- if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
- rprintf(FERROR, "write failed on %s: %s\n",
-+ full_fname(fname), strerror(errno));
++ if (do_fsync && fd != -1 && fsync(fd) != 0) {
++ rsyserr(FERROR, errno, "fsync failed on %s",
++ full_fname(fname));
+ exit_cleanup(RERR_FILEIO);
+ }
+
-+ if (do_fsync && (fd != -1) && (fsync(fd) != 0)) {
-+ rprintf(FERROR, "fsync failed on %s: %s\n",
- full_fname(fname), strerror(errno));
- exit_cleanup(RERR_FILEIO);
- }
---- util.c 8 May 2004 20:03:39 -0000 1.142
-+++ util.c 13 May 2004 19:01:46 -0000
-@@ -29,6 +29,7 @@
+ sum_len = sum_end(file_sum1);
- extern int verbose;
- extern struct exclude_list_struct server_exclude_list;
-+extern int do_fsync;
+ if (mapbuf)
+--- old/t_stub.c
++++ new/t_stub.c
+@@ -21,6 +21,7 @@
- int sanitize_paths = 0;
+ #include "rsync.h"
-@@ -296,6 +297,12 @@ int copy_file(char *source, char *dest,
++int do_fsync = 0;
+ int modify_window = 0;
+ int module_id = -1;
+ int relative_paths = 0;
+--- old/util.c
++++ new/util.c
+@@ -25,6 +25,7 @@
+ extern int verbose;
+ extern int dry_run;
+ extern int module_id;
++extern int do_fsync;
+ extern int modify_window;
+ extern int relative_paths;
+ extern int human_readable;
+@@ -309,6 +310,13 @@ int copy_file(const char *source, const
+ full_fname(source));
+ }
- if (close(ofd) < 0) {
- rprintf(FERROR, "close failed on %s: %s\n",
-+ full_fname(dest), strerror(errno));
++ if (do_fsync && fsync(ofd) < 0) {
++ rsyserr(FERROR, errno, "fsync failed on %s",
++ full_fname(dest));
++ close(ofd);
+ return -1;
+ }
+
-+ if (do_fsync && fsync(ofd) < 0) {
-+ rprintf(FERROR, "fsync failed on %s: %s\n",
- full_fname(dest), strerror(errno));
- return -1;
- }
+ if (close(ofd) < 0) {
+ rsyserr(FERROR, errno, "close failed on %s",
+ full_fname(dest));