| 1 | This patch from Sami Farin lets you specify --fsync if you want fsync() |
| 2 | to be called on every file we write. |
| 3 | |
| 4 | --- orig/options.c 2005-07-28 01:46:25 |
| 5 | +++ options.c 2005-07-28 01:47:53 |
| 6 | @@ -42,6 +42,7 @@ int append_mode = 0; |
| 7 | int archive_mode = 0; |
| 8 | int keep_dirlinks = 0; |
| 9 | int copy_links = 0; |
| 10 | +int do_fsync = 0; |
| 11 | int preserve_links = 0; |
| 12 | int preserve_hard_links = 0; |
| 13 | int preserve_perms = 0; |
| 14 | @@ -314,6 +315,7 @@ void usage(enum logcode F) |
| 15 | rprintf(F," --partial keep partially transferred files\n"); |
| 16 | rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n"); |
| 17 | rprintf(F," --delay-updates put all updated files into place at transfer's end\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 | @@ -398,6 +400,7 @@ static struct poptOption long_options[] |
| 23 | {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, |
| 24 | {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, |
| 25 | {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, |
| 26 | + {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 }, |
| 27 | {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 }, |
| 28 | {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 }, |
| 29 | {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, |
| 30 | @@ -1471,6 +1474,9 @@ void server_options(char **args,int *arg |
| 31 | args[ac++] = tmpdir; |
| 32 | } |
| 33 | |
| 34 | + if (do_fsync && am_sender) |
| 35 | + args[ac++] = "--fsync"; |
| 36 | + |
| 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 |
| 40 | --- orig/receiver.c 2005-07-28 01:46:25 |
| 41 | +++ receiver.c 2005-02-20 00:17:37 |
| 42 | @@ -38,6 +38,7 @@ extern int keep_dirlinks; |
| 43 | extern int preserve_hard_links; |
| 44 | extern int preserve_perms; |
| 45 | extern int io_error; |
| 46 | +extern int do_fsync; |
| 47 | extern int basis_dir_cnt; |
| 48 | extern int make_backups; |
| 49 | extern int cleanup_got_literal; |
| 50 | @@ -314,6 +315,12 @@ static int receive_data(int f_in, char * |
| 51 | exit_cleanup(RERR_FILEIO); |
| 52 | } |
| 53 | |
| 54 | + if (do_fsync && fd != -1 && fsync(fd) != 0) { |
| 55 | + rsyserr(FERROR, errno, "fsync failed on %s", |
| 56 | + full_fname(fname)); |
| 57 | + exit_cleanup(RERR_FILEIO); |
| 58 | + } |
| 59 | + |
| 60 | sum_end(file_sum1); |
| 61 | |
| 62 | if (mapbuf) |
| 63 | --- orig/t_stub.c 2005-01-25 10:39:14 |
| 64 | +++ t_stub.c 2004-10-09 04:03:09 |
| 65 | @@ -28,6 +28,7 @@ |
| 66 | |
| 67 | int modify_window = 0; |
| 68 | int module_id = -1; |
| 69 | +int do_fsync; |
| 70 | char *partial_dir; |
| 71 | struct filter_list_struct server_filter_list; |
| 72 | |
| 73 | --- orig/util.c 2005-07-27 23:31:12 |
| 74 | +++ util.c 2004-07-03 20:18:13 |
| 75 | @@ -33,6 +33,7 @@ extern int module_id; |
| 76 | extern int modify_window; |
| 77 | extern char *partial_dir; |
| 78 | extern struct filter_list_struct server_filter_list; |
| 79 | +extern int do_fsync; |
| 80 | |
| 81 | int sanitize_paths = 0; |
| 82 | |
| 83 | @@ -310,6 +311,12 @@ int copy_file(char *source, char *dest, |
| 84 | return -1; |
| 85 | } |
| 86 | |
| 87 | + if (do_fsync && fsync(ofd) < 0) { |
| 88 | + rsyserr(FERROR, errno, "fsync failed on %s", |
| 89 | + full_fname(dest)); |
| 90 | + return -1; |
| 91 | + } |
| 92 | + |
| 93 | return 0; |
| 94 | } |
| 95 | |