From 740551d6576f28b42bc53c3e7e7e150adafa20e4 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 19 Jan 2014 14:59:43 -0800 Subject: Undo the hard-link xattr optimization in 78286a03. I'm backing out the xattr optimization that was put in to try to make xattr data sending more optimal on hard-linked files. The code was causing hard-to-reproduce bugs, and it's better to get things done fully & correctly over fully optimally. --- receiver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'receiver.c') diff --git a/receiver.c b/receiver.c index 1e064d9d..48540d2e 100644 --- a/receiver.c +++ b/receiver.c @@ -580,16 +580,14 @@ int recv_files(int f_in, int f_out, char *local_name) rprintf(FINFO, "recv_files(%s)\n", fname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers - && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) recv_xattr_request(file, f_in); #endif if (!(iflags & ITEM_TRANSFER)) { maybe_log_item(file, iflags, itemizing, xname); #ifdef SUPPORT_XATTRS - if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers - && !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)) + if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers) set_file_attrs(fname, file, NULL, fname, 0); #endif if (iflags & ITEM_IS_NEW) { -- cgit v1.2.1