Skip to content

Handle Invalid cross-device link on certain renames. Fixes issue 518. #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle Invalid cross-device link on certain renames. Fixes issue 518. #523

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e370b
Handle Invalid cross-device link on certain renames. Fixes issue 518.
FilipeMaia Sep 5, 2023
f70fdeb
Merge branch 'RsyncProject:master' into xdevice-symlink
FilipeMaia Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions generator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2040,10 +2040,24 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
}

if (!skip_atomic) {
if (do_rename(tmpname, fname) < 0) {
rsyserr(FERROR_XFER, errno, "rename %s -> \"%s\" failed",
full_fname(tmpname), full_fname(fname));
do_unlink(tmpname);
if (do_rename(tmpname, fname) < 0) {
/* In certain cases, renames of symlinks pointing to another device,
* or dangling symlinks will fail with "Invalid cross-device link".
* In this case we'll do the same as mv(1) and manually create the symlink
*/
if(errno == EXDEV && slnk){
do_unlink(tmpname);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this would no longer be atomic, need to check with @WayneD if this matters

do_unlink(fname);
if (do_symlink(slnk, fname) < 0) {
rsyserr(FERROR_XFER, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), slnk);
return 0;
}
}else{
rsyserr(FERROR_XFER, errno, "rename %s -> %s failed",
full_fname(tmpname), full_fname(fname));
do_unlink(tmpname);
}
return 0;
}
}
Expand Down