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 | ||
03019e41 WD |
4 | To use this patch, run these commands for a successful build: |
5 | ||
6 | patch -p1 <patches/fsync.diff | |
7 | ./configure (optional if already run) | |
8 | make | |
9 | ||
72e5645e | 10 | based-on: 3b8f8192227b14e708bf535072485e50f4362270 |
cc3e685d WD |
11 | diff --git a/options.c b/options.c |
12 | --- a/options.c | |
13 | +++ b/options.c | |
c0c7984e | 14 | @@ -48,6 +48,7 @@ int append_mode = 0; |
125d7fca | 15 | int keep_dirlinks = 0; |
d42637db | 16 | int copy_dirlinks = 0; |
edd5f785 | 17 | int copy_links = 0; |
994f69cd WD |
18 | +int do_fsync = 0; |
19 | int preserve_links = 0; | |
20 | int preserve_hard_links = 0; | |
87a38eea | 21 | int preserve_acls = 0; |
72e5645e | 22 | @@ -731,6 +732,7 @@ void usage(enum logcode F) |
a7219d20 WD |
23 | rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n"); |
24 | rprintf(F," --delay-updates put all updated files into place at transfer's end\n"); | |
4a65fe72 | 25 | rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n"); |
edd5f785 | 26 | + rprintf(F," --fsync fsync every written file\n"); |
a7219d20 | 27 | rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n"); |
fc557362 WD |
28 | rprintf(F," --usermap=STRING custom username mapping\n"); |
29 | rprintf(F," --groupmap=STRING custom groupname mapping\n"); | |
72e5645e | 30 | @@ -989,6 +991,7 @@ static struct poptOption long_options[] = { |
790ba11a | 31 | {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 }, |
cc3e685d | 32 | {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 }, |
c0c7984e | 33 | {"no-contimeout", 0, POPT_ARG_VAL, &connect_timeout, 0, 0, 0 }, |
790ba11a WD |
34 | + {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 }, |
35 | {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, | |
36 | {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, | |
37 | {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, | |
72e5645e | 38 | @@ -2573,6 +2576,9 @@ void server_options(char **args, int *argc_p) |
80c89075 WD |
39 | args[ac++] = tmpdir; |
40 | } | |
7b675ff5 | 41 | |
80c89075 WD |
42 | + if (do_fsync) |
43 | + args[ac++] = "--fsync"; | |
7b675ff5 | 44 | + |
80c89075 WD |
45 | if (basis_dir[0]) { |
46 | /* the server only needs this option if it is not the sender, | |
47 | * and it may be an older version that doesn't know this | |
cc3e685d WD |
48 | diff --git a/receiver.c b/receiver.c |
49 | --- a/receiver.c | |
50 | +++ b/receiver.c | |
fc557362 | 51 | @@ -38,6 +38,7 @@ extern int relative_paths; |
b76d92e6 | 52 | extern int preserve_hard_links; |
f6c3b300 | 53 | extern int preserve_perms; |
5795bf59 | 54 | extern int preserve_xattrs; |
edd5f785 | 55 | +extern int do_fsync; |
1d15f8d9 WD |
56 | extern int basis_dir_cnt; |
57 | extern int make_backups; | |
58 | extern int cleanup_got_literal; | |
72e5645e | 59 | @@ -337,6 +338,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r, |
fc557362 WD |
60 | if (sum_end(file_sum1) != checksum_len) |
61 | overflow_exit("checksum_len"); /* Impossible... */ | |
edd5f785 | 62 | |
67c08134 | 63 | + if (do_fsync && fd != -1 && fsync(fd) != 0) { |
7b675ff5 | 64 | + rsyserr(FERROR, errno, "fsync failed on %s", |
fe6407b5 | 65 | + full_fname(fname)); |
edd5f785 WD |
66 | + exit_cleanup(RERR_FILEIO); |
67 | + } | |
68 | + | |
dc3ae351 | 69 | if (mapbuf) |
fc557362 WD |
70 | unmap_file(mapbuf); |
71 | ||
cc3e685d WD |
72 | diff --git a/t_stub.c b/t_stub.c |
73 | --- a/t_stub.c | |
74 | +++ b/t_stub.c | |
87a38eea | 75 | @@ -21,6 +21,7 @@ |
7cf8a551 WD |
76 | |
77 | #include "rsync.h" | |
d9a67109 WD |
78 | |
79 | +int do_fsync = 0; | |
80 | int modify_window = 0; | |
01c39596 | 81 | int module_id = -1; |
56208f7b | 82 | int relative_paths = 0; |
cc3e685d WD |
83 | diff --git a/util.c b/util.c |
84 | --- a/util.c | |
85 | +++ b/util.c | |
fc557362 WD |
86 | @@ -27,6 +27,7 @@ |
87 | ||
91f798a7 | 88 | extern int dry_run; |
56208f7b | 89 | extern int module_id; |
91f798a7 | 90 | +extern int do_fsync; |
7b675ff5 | 91 | extern int modify_window; |
56208f7b | 92 | extern int relative_paths; |
fc557362 | 93 | extern int preserve_xattrs; |
72e5645e | 94 | @@ -382,6 +383,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode) |
71c2e1b2 | 95 | full_fname(source)); |
7b675ff5 | 96 | } |
edd5f785 | 97 | |
7b675ff5 WD |
98 | + if (do_fsync && fsync(ofd) < 0) { |
99 | + rsyserr(FERROR, errno, "fsync failed on %s", | |
fe6407b5 | 100 | + full_fname(dest)); |
6cf4b26e | 101 | + close(ofd); |
edd5f785 WD |
102 | + return -1; |
103 | + } | |
104 | + | |
71c2e1b2 | 105 | if (close(ofd) < 0) { |
91270139 | 106 | int save_errno = errno; |
cc3e685d | 107 | rsyserr(FERROR_XFER, errno, "close failed on %s", |