TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-09-11 00:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fuse-overlayfs: skip whiteouts when comparing hardlinks during a rename

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-07-12 18:32:06 +02:00
parent 382b0d8e0c
commit f58a9c452e
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.c
View File

@ -2481,7 +2481,7 @@ ovl_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
} }
} }
if (destnode != NULL && node_dirp (destnode)) if (destnode != NULL && !destnode->whiteout && node_dirp (destnode))
{ {
errno = EISDIR; errno = EISDIR;
goto error; goto error;
@ -2490,7 +2490,7 @@ ovl_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
rm = hash_lookup (destpnode->children, &key); rm = hash_lookup (destpnode->children, &key);
if (rm) if (rm)
{ {
if (rm->ino == node->ino) if (!rm->whiteout && rm->ino == node->ino)
{ {
fuse_reply_err (req, 0); fuse_reply_err (req, 0);
return; return;
@ -2562,6 +2562,8 @@ ovl_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
} }
else else
{ {
unlinkat (destfd, newname, 0);
/* Try to create the whiteout atomically, if it fails do the /* Try to create the whiteout atomically, if it fails do the
rename+mknod separately. */ rename+mknod separately. */
ret = syscall (SYS_renameat2, srcfd, name, destfd, ret = syscall (SYS_renameat2, srcfd, name, destfd,