diff options
| author | Wayne Davison <wayned@samba.org> | 2014-01-19 14:59:43 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2014-01-19 14:59:43 -0800 |
| commit | 740551d6576f28b42bc53c3e7e7e150adafa20e4 (patch) | |
| tree | d7535ac23a456ae4d5e178c3d24fad0ab455b01e /generator.c | |
| parent | a106ed78d57f901ccfdf5145923f8c2bf6b33ef8 (diff) | |
| download | android_external_rsync-740551d6576f28b42bc53c3e7e7e150adafa20e4.tar.gz android_external_rsync-740551d6576f28b42bc53c3e7e7e150adafa20e4.tar.bz2 android_external_rsync-740551d6576f28b42bc53c3e7e7e150adafa20e4.zip | |
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.
Diffstat (limited to 'generator.c')
| -rw-r--r-- | generator.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/generator.c b/generator.c index b2ca2e05..0f77481e 100644 --- a/generator.c +++ b/generator.c @@ -550,9 +550,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre #ifdef SUPPORT_XATTRS if (preserve_xattrs && do_xfers && iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) { - int fd = iflags & ITEM_REPORT_XATTR - && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)) - ? sock_f_out : -1; + int fd = iflags & ITEM_REPORT_XATTR ? sock_f_out : -1; send_xattr_request(NULL, file, fd); } #endif |