This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
+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
-@@ -43,6 +43,7 @@ int append_mode = 0;
+@@ -45,6 +45,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;
int preserve_hard_links = 0;
- int preserve_perms = 0;
-@@ -329,6 +330,7 @@ void usage(enum logcode F)
+ int preserve_acls = 0;
+@@ -375,6 +376,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," --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");
-@@ -504,6 +506,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 },
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
+@@ -600,6 +602,7 @@ static struct poptOption long_options[]
+ {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
+ {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 },
++ {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1705,6 +1708,9 @@ void server_options(char **args,int *arg
- args[ac++] = tmpdir;
- }
+ {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
+ {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+@@ -1934,6 +1937,9 @@ void server_options(char **args, int *ar
+ args[ac++] = tmpdir;
+ }
-+ if (do_fsync && am_sender)
-+ args[ac++] = "--fsync";
++ if (do_fsync)
++ args[ac++] = "--fsync";
+
- if (basis_dir[0] && am_sender) {
- /* the server only needs this option if it is not the sender,
- * and it may be an older version that doesn't know this
+ 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
-@@ -36,6 +36,7 @@ extern int protocol_version;
- extern int relative_paths;
+@@ -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;
-@@ -252,6 +253,12 @@ static int receive_data(int f_in, char *
+@@ -261,6 +262,12 @@ static int receive_data(int f_in, char *
exit_cleanup(RERR_FILEIO);
}
+ exit_cleanup(RERR_FILEIO);
+ }
+
- sum_end(file_sum1);
+ sum_len = sum_end(file_sum1);
if (mapbuf)
--- old/t_stub.c
+++ new/t_stub.c
-@@ -26,6 +26,7 @@
- * functions, so that module test harnesses can run standalone.
- **/
+@@ -21,6 +21,7 @@
+
+ #include "rsync.h"
+int do_fsync = 0;
int modify_window = 0;
int relative_paths = 0;
--- old/util.c
+++ new/util.c
-@@ -30,6 +30,7 @@
+@@ -25,6 +25,7 @@
extern int verbose;
extern int dry_run;
extern int module_id;
extern int modify_window;
extern int relative_paths;
extern int human_readable;
-@@ -319,6 +320,12 @@ int copy_file(const char *source, const
- return -1;
+@@ -310,6 +311,13 @@ int copy_file(const char *source, const
+ full_fname(source));
}
+ if (do_fsync && fsync(ofd) < 0) {
+ rsyserr(FERROR, errno, "fsync failed on %s",
+ full_fname(dest));
++ close(ofd);
+ return -1;
+ }
+
- return 0;
- }
-
+ if (close(ofd) < 0) {
+ rsyserr(FERROR, errno, "close failed on %s",
+ full_fname(dest));