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 | ||
7f2baf27 | 4 | --- options.c 6 May 2004 21:08:01 -0000 1.148 |
7b675ff5 | 5 | +++ options.c 21 May 2004 08:59:11 -0000 |
edd5f785 WD |
6 | @@ -37,6 +37,7 @@ int make_backups = 0; |
7 | **/ | |
8 | int whole_file = -1; | |
9 | ||
10 | +int do_fsync = 0; | |
11 | int archive_mode = 0; | |
12 | int copy_links = 0; | |
13 | int preserve_links = 0; | |
14 | @@ -230,6 +231,7 @@ void usage(enum logcode F) | |
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"); | |
20 | rprintf(F," -l, --links copy symlinks as symlinks\n"); | |
21 | rprintf(F," -L, --copy-links copy the referent of all symlinks\n"); | |
22 | @@ -332,6 +334,7 @@ static struct poptOption long_options[] | |
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 }, | |
7b675ff5 | 30 | @@ -944,6 +947,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 WD |
39 | * and it may be an older version that doesn't know this |
40 | --- receiver.c 21 May 2004 08:27:04 -0000 1.79 | |
41 | +++ receiver.c 21 May 2004 08:59:11 -0000 | |
42 | @@ -47,6 +47,7 @@ extern int ignore_errors; | |
edd5f785 | 43 | extern int orig_umask; |
7f2baf27 | 44 | extern int keep_partial; |
7b675ff5 | 45 | extern int checksum_seed; |
edd5f785 WD |
46 | +extern int do_fsync; |
47 | ||
48 | static void delete_one(char *fn, int is_dir) | |
49 | { | |
7b675ff5 WD |
50 | @@ -271,6 +272,12 @@ static int receive_data(int f_in,struct |
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 WD |
62 | read_buf(f_in,file_sum2,MD4_SUM_LENGTH); |
63 | --- util.c 21 May 2004 08:40:25 -0000 1.144 | |
64 | +++ util.c 21 May 2004 08:59:11 -0000 | |
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 |