| | 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 | --- old/options.c |
| | 5 | +++ new/options.c |
| | 6 | @@ -42,6 +42,7 @@ int whole_file = -1; |
| | 7 | int append_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 | @@ -328,6 +329,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 | @@ -503,6 +505,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 | @@ -1696,6 +1699,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 | --- old/receiver.c |
| | 41 | +++ new/receiver.c |
| | 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 | @@ -257,6 +258,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 | --- old/t_stub.c |
| | 64 | +++ new/t_stub.c |
| | 65 | @@ -30,6 +30,7 @@ int modify_window = 0; |
| | 66 | int module_id = -1; |
| | 67 | int relative_paths = 0; |
| | 68 | int human_readable = 0; |
| | 69 | +int do_fsync; |
| | 70 | char *partial_dir; |
| | 71 | struct filter_list_struct server_filter_list; |
| | 72 | |
| | 73 | --- old/util.c |
| | 74 | +++ new/util.c |
| | 75 | @@ -30,6 +30,7 @@ |
| | 76 | extern int verbose; |
| | 77 | extern int dry_run; |
| | 78 | extern int module_id; |
| | 79 | +extern int do_fsync; |
| | 80 | extern int modify_window; |
| | 81 | extern int relative_paths; |
| | 82 | extern int human_readable; |
| | 83 | @@ -303,6 +304,12 @@ int copy_file(const char *source, const |
| | 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 | |
Matt McCutchen's Web Site / rsync / rsync-patches.git / blame_incremental