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 | ||
489b0a72 WD |
4 | --- orig/options.c 2005-08-27 21:11:26 |
5 | +++ options.c 2005-08-27 21:21:34 | |
6 | @@ -41,6 +41,7 @@ int whole_file = -1; | |
7 | int append_mode = 0; | |
125d7fca | 8 | int keep_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; | |
489b0a72 | 14 | @@ -312,6 +313,7 @@ void usage(enum logcode F) |
a7219d20 WD |
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"); | |
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"); | |
489b0a72 WD |
22 | @@ -467,6 +469,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}, | |
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 }, | |
30 | @@ -1495,6 +1498,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 |
489b0a72 | 40 | --- orig/receiver.c 2005-08-17 06:45:08 |
1d15f8d9 | 41 | +++ receiver.c 2005-02-20 00:17:37 |
388bf7cc | 42 | @@ -38,6 +38,7 @@ extern int keep_dirlinks; |
b76d92e6 | 43 | extern int preserve_hard_links; |
f6c3b300 | 44 | extern int preserve_perms; |
f6c3b300 | 45 | extern int io_error; |
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; | |
489b0a72 | 50 | @@ -318,6 +319,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) |
36bbf3d1 | 63 | --- orig/t_stub.c 2005-01-25 10:39:14 |
01c39596 WD |
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; | |
4f9b6a01 | 71 | struct filter_list_struct server_filter_list; |
01c39596 | 72 | |
489b0a72 | 73 | --- orig/util.c 2005-08-17 06:45:08 |
13bed3dd | 74 | +++ util.c 2004-07-03 20:18:13 |
afbebe13 | 75 | @@ -33,6 +33,7 @@ extern int module_id; |
7b675ff5 | 76 | extern int modify_window; |
afbebe13 | 77 | extern char *partial_dir; |
4f9b6a01 | 78 | extern struct filter_list_struct server_filter_list; |
edd5f785 WD |
79 | +extern int do_fsync; |
80 | ||
81 | int sanitize_paths = 0; | |
82 | ||
994f69cd | 83 | @@ -310,6 +311,12 @@ int copy_file(char *source, char *dest, |
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 |