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 | ||
f6c3b300 | 4 | --- orig/options.c 2004-07-16 20:07:22 |
13bed3dd | 5 | +++ options.c 2004-07-03 20:18:13 |
125d7fca | 6 | @@ -38,6 +38,7 @@ int make_backups = 0; |
edd5f785 WD |
7 | **/ |
8 | int whole_file = -1; | |
9 | ||
10 | +int do_fsync = 0; | |
11 | int archive_mode = 0; | |
125d7fca | 12 | int keep_dirlinks = 0; |
edd5f785 | 13 | int copy_links = 0; |
f6c3b300 | 14 | @@ -238,6 +239,7 @@ void usage(enum logcode F) |
edd5f785 WD |
15 | rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); |
16 | rprintf(F," --backup-dir make backups into this directory\n"); | |
17 | rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); | |
18 | + rprintf(F," --fsync fsync every written file\n"); | |
19 | rprintf(F," -u, --update update only (don't overwrite newer files)\n"); | |
f6c3b300 | 20 | rprintf(F," --inplace update the destination file inplace (see man page)\n"); |
125d7fca | 21 | rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); |
f6c3b300 | 22 | @@ -343,6 +345,7 @@ static struct poptOption long_options[] |
edd5f785 WD |
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 }, | |
f6c3b300 | 30 | @@ -998,6 +1001,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 | + |
edd5f785 WD |
37 | if (compare_dest && am_sender) { |
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 |
f6c3b300 WD |
40 | --- orig/receiver.c 2004-07-16 20:07:22 |
41 | +++ receiver.c 2004-07-16 20:13:31 | |
42 | @@ -35,6 +35,7 @@ extern int preserve_hard_links; | |
43 | extern int preserve_perms; | |
44 | extern int cvs_exclude; | |
45 | extern int io_error; | |
edd5f785 | 46 | +extern int do_fsync; |
f6c3b300 WD |
47 | extern char *tmpdir; |
48 | extern char *compare_dest; | |
49 | extern int make_backups; | |
50 | @@ -289,6 +290,12 @@ static int receive_data(int f_in,struct | |
7b675ff5 WD |
51 | exit_cleanup(RERR_FILEIO); |
52 | } | |
edd5f785 | 53 | |
7b675ff5 WD |
54 | + if (do_fsync && (fd != -1) && (fsync(fd) != 0)) { |
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 | |
7b675ff5 | 62 | read_buf(f_in,file_sum2,MD4_SUM_LENGTH); |
13bed3dd WD |
63 | --- orig/util.c 2004-06-09 21:54:47 |
64 | +++ util.c 2004-07-03 20:18:13 | |
7b675ff5 WD |
65 | @@ -32,6 +32,7 @@ extern int dry_run; |
66 | extern int module_id; | |
67 | extern int modify_window; | |
edd5f785 WD |
68 | extern struct exclude_list_struct server_exclude_list; |
69 | +extern int do_fsync; | |
70 | ||
71 | int sanitize_paths = 0; | |
72 | ||
7b675ff5 WD |
73 | @@ -297,6 +298,12 @@ int copy_file(char *source, char *dest, |
74 | return -1; | |
75 | } | |
edd5f785 | 76 | |
7b675ff5 WD |
77 | + if (do_fsync && fsync(ofd) < 0) { |
78 | + rsyserr(FERROR, errno, "fsync failed on %s", | |
fe6407b5 | 79 | + full_fname(dest)); |
edd5f785 WD |
80 | + return -1; |
81 | + } | |
82 | + | |
7b675ff5 WD |
83 | return 0; |
84 | } | |
85 |