Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed failing hunks.
[rsync/rsync-patches.git]
/
fsync.diff
diff --git
a/fsync.diff
b/fsync.diff
index
f6674ab
..
0424fde
100644
(file)
--- a/
fsync.diff
+++ b/
fsync.diff
@@
-1,53
+1,59
@@
This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
---- orig/options.c 2005-08-27 21:11:26
-+++ options.c 2005-08-27 21:21:34
-@@ -41,6 +41,7 @@ int whole_file = -1;
- int append_mode = 0;
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/fsync.diff
+ ./configure (optional if already run)
+ make
+
+--- old/options.c
++++ new/options.c
+@@ -44,6 +44,7 @@ int append_mode = 0;
int keep_dirlinks = 0;
int keep_dirlinks = 0;
+ int copy_dirlinks = 0;
int copy_links = 0;
+int do_fsync = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int copy_links = 0;
+int do_fsync = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
- int preserve_perms = 0;
-@@ -312,6 +313,7 @@ void usage(enum logcode F)
- rprintf(F," --partial keep partially transferred files\n");
+ int preserve_acls = 0;
+@@ -367,6 +368,7 @@ void usage(enum logcode F)
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
+ rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
+ rprintf(F," --fsync fsync every written file\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
+ rprintf(F," --fsync fsync every written file\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
-@@ -467,6 +469,7 @@ static struct poptOption long_options[]
- {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
+@@ -580,6 +582,7 @@ static struct poptOption long_options[]
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
- {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
+ {"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
+ {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
+ {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
+ {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
+ {"numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 1, 0, 0 },
+ {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
- {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1495,6 +1498,9 @@ void server_options(char **args,int *arg
- args[ac++] = tmpdir;
- }
+@@ -1885,6 +1888,9 @@ void server_options(char **args,int *arg
+ args[ac++] = tmpdir;
+ }
-+
if (do_fsync && am_sender
)
-+ args[ac++] = "--fsync";
++
if (do_fsync
)
++
args[ac++] = "--fsync";
+
+
-
if (basis_dir[0] && am_sender
) {
- /* the server only needs this option if it is not the sender,
- * and it may be an older version that doesn't know this
---- o
rig/receiver.c 2005-08-17 06:45:08
-+++
receiver.c 2005-02-20 00:17:37
-@@ -3
8,6 +38,7 @@ extern int keep_dirlink
s;
+
if (basis_dir[0]
) {
+
/* the server only needs this option if it is not the sender,
+
* and it may be an older version that doesn't know this
+--- o
ld/receiver.c
++++
new/receiver.c
+@@ -3
9,6 +39,7 @@ extern int relative_path
s;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_hard_links;
extern int preserve_perms;
- extern int
io_error
;
+ extern int
preserve_xattrs
;
+extern int do_fsync;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
+extern int do_fsync;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-@@ -
318,6 +319
,12 @@ static int receive_data(int f_in, char *
+@@ -
259,6 +260
,12 @@ static int receive_data(int f_in, char *
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
@@
-57,39
+63,40
@@
to be called on every file we write.
+ exit_cleanup(RERR_FILEIO);
+ }
+
+ exit_cleanup(RERR_FILEIO);
+ }
+
- sum_end(file_sum1);
+ sum_
len = sum_
end(file_sum1);
if (mapbuf)
if (mapbuf)
---- o
rig/t_stub.c 2005-01-25 10:39:14
-+++
t_stub.c 2004-10-09 04:03:09
-@@ -2
8,6 +28
,7 @@
+--- o
ld/t_stub.c
++++
new/t_stub.c
+@@ -2
1,6 +21
,7 @@
+ #include "rsync.h"
+
++int do_fsync = 0;
int modify_window = 0;
int module_id = -1;
int modify_window = 0;
int module_id = -1;
-+int do_fsync;
- char *partial_dir;
- struct filter_list_struct server_filter_list;
-
---- orig/util.c 2005-08-17 06:45:08
-+++ util.c 2004-07-03 20:18:13
-@@ -33,6 +33,7 @@ extern int module_id;
- extern int modify_window;
- extern char *partial_dir;
- extern struct filter_list_struct server_filter_list;
+ int relative_paths = 0;
+--- old/util.c
++++ new/util.c
+@@ -25,6 +25,7 @@
+ extern int verbose;
+ extern int dry_run;
+ extern int module_id;
+extern int do_fsync;
+extern int do_fsync;
-
-
int sanitize_paths = 0
;
-
-@@ -3
10,6 +311,12 @@ int copy_file(char *source, char *dest,
-
return -1
;
+ extern int modify_window;
+
extern int relative_paths
;
+ extern int human_readable;
+@@ -3
09,6 +310,13 @@ int copy_file(const char *source, const
+
full_fname(source))
;
}
+ if (do_fsync && fsync(ofd) < 0) {
+ rsyserr(FERROR, errno, "fsync failed on %s",
+ full_fname(dest));
}
+ if (do_fsync && fsync(ofd) < 0) {
+ rsyserr(FERROR, errno, "fsync failed on %s",
+ full_fname(dest));
++ close(ofd);
+ return -1;
+ }
+
+ return -1;
+ }
+
- return 0;
- }
-
+ if (close(ofd) < 0) {
+ rsyserr(FERROR, errno, "close failed on %s",
+ full_fname(dest));