Commit | Line | Data |
---|---|---|
edd5f785 WD |
1 | This patch from Sami Farin lets you specify --fsync if you want fsync() |
2 | to be called on every file we write. | |
3 | ||
9a7eef96 WD |
4 | --- old/options.c |
5 | +++ new/options.c | |
d42637db | 6 | @@ -43,6 +43,7 @@ int append_mode = 0; |
125d7fca | 7 | int keep_dirlinks = 0; |
d42637db | 8 | int copy_dirlinks = 0; |
edd5f785 | 9 | int copy_links = 0; |
994f69cd WD |
10 | +int do_fsync = 0; |
11 | int preserve_links = 0; | |
12 | int preserve_hard_links = 0; | |
13 | int preserve_perms = 0; | |
d42637db | 14 | @@ -329,6 +330,7 @@ void usage(enum logcode F) |
a7219d20 WD |
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"); | |
4a65fe72 | 17 | rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n"); |
edd5f785 | 18 | + rprintf(F," --fsync fsync every written file\n"); |
a7219d20 WD |
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"); | |
d42637db | 22 | @@ -504,6 +506,7 @@ static struct poptOption long_options[] |
489b0a72 WD |
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}, | |
edd5f785 | 26 | + {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 }, |
489b0a72 WD |
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 }, | |
d42637db | 30 | @@ -1705,6 +1708,9 @@ void server_options(char **args,int *arg |
edd5f785 WD |
31 | args[ac++] = tmpdir; |
32 | } | |
7b675ff5 | 33 | |
edd5f785 WD |
34 | + if (do_fsync && am_sender) |
35 | + args[ac++] = "--fsync"; | |
7b675ff5 | 36 | + |
0808daa5 | 37 | if (basis_dir[0] && am_sender) { |
edd5f785 | 38 | /* the server only needs this option if it is not the sender, |
7b675ff5 | 39 | * and it may be an older version that doesn't know this |
9a7eef96 WD |
40 | --- old/receiver.c |
41 | +++ new/receiver.c | |
d42637db WD |
42 | @@ -36,6 +36,7 @@ extern int protocol_version; |
43 | extern int relative_paths; | |
b76d92e6 | 44 | extern int preserve_hard_links; |
f6c3b300 | 45 | extern int preserve_perms; |
edd5f785 | 46 | +extern int do_fsync; |
1d15f8d9 WD |
47 | extern int basis_dir_cnt; |
48 | extern int make_backups; | |
49 | extern int cleanup_got_literal; | |
d42637db | 50 | @@ -252,6 +253,12 @@ static int receive_data(int f_in, char * |
7b675ff5 WD |
51 | exit_cleanup(RERR_FILEIO); |
52 | } | |
edd5f785 | 53 | |
67c08134 | 54 | + if (do_fsync && fd != -1 && fsync(fd) != 0) { |
7b675ff5 | 55 | + rsyserr(FERROR, errno, "fsync failed on %s", |
fe6407b5 | 56 | + full_fname(fname)); |
edd5f785 WD |
57 | + exit_cleanup(RERR_FILEIO); |
58 | + } | |
59 | + | |
7b675ff5 | 60 | sum_end(file_sum1); |
edd5f785 | 61 | |
dc3ae351 | 62 | if (mapbuf) |
9a7eef96 WD |
63 | --- old/t_stub.c |
64 | +++ new/t_stub.c | |
d9a67109 WD |
65 | @@ -26,6 +26,7 @@ |
66 | * functions, so that module test harnesses can run standalone. | |
67 | **/ | |
68 | ||
69 | +int do_fsync = 0; | |
70 | int modify_window = 0; | |
01c39596 | 71 | int module_id = -1; |
56208f7b | 72 | int relative_paths = 0; |
9a7eef96 WD |
73 | --- old/util.c |
74 | +++ new/util.c | |
91f798a7 WD |
75 | @@ -30,6 +30,7 @@ |
76 | extern int verbose; | |
77 | extern int dry_run; | |
56208f7b | 78 | extern int module_id; |
91f798a7 | 79 | +extern int do_fsync; |
7b675ff5 | 80 | extern int modify_window; |
56208f7b | 81 | extern int relative_paths; |
91f798a7 | 82 | extern int human_readable; |
d42637db | 83 | @@ -319,6 +320,12 @@ int copy_file(const char *source, const |
7b675ff5 WD |
84 | return -1; |
85 | } | |
edd5f785 | 86 | |
7b675ff5 WD |
87 | + if (do_fsync && fsync(ofd) < 0) { |
88 | + rsyserr(FERROR, errno, "fsync failed on %s", | |
fe6407b5 | 89 | + full_fname(dest)); |
edd5f785 WD |
90 | + return -1; |
91 | + } | |
92 | + | |
7b675ff5 WD |
93 | return 0; |
94 | } | |
95 |