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

Merge pull request #129 from giuseppe/skip-whiteout-creation-if-not-needed

Browse Source 
main: skip whiteout creation if not needed
This commit is contained in:
Daniel J Walsh 2019-10-03 14:17:38 -04:00 committed by GitHub
commit 504862881f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@ -979,8 +979,7 @@ hide_node (struct ovl_data *lo, struct ovl_node *node, bool unlink_src)
bool whiteout_created = false; bool whiteout_created = false;
bool needs_whiteout; bool needs_whiteout;
needs_whiteout = node->parent && node->parent->last_layer != get_upper_layer (lo); needs_whiteout = (node->last_layer != get_upper_layer (lo)) && (node->parent && node->parent->last_layer != get_upper_layer (lo));
if (needs_whiteout) if (needs_whiteout)
{ {
/* If the atomic rename+mknod failed, then fallback into doing it in two steps. */ /* If the atomic rename+mknod failed, then fallback into doing it in two steps. */
@ -3235,6 +3234,9 @@ ovl_do_open (fuse_req_t req, fuse_ino_t parent, const char *name, int flags, mod
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
if (!is_whiteout)
n->last_layer = get_upper_layer (lo);
n = insert_node (p, n, true); n = insert_node (p, n, true);
if (n == NULL) if (n == NULL)
{ {
@ -3703,6 +3705,8 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }
if (destnode && !destnode->whiteout)
node->last_layer = get_upper_layer (lo);
node = insert_node (newparentnode, node, true); node = insert_node (newparentnode, node, true);
if (node == NULL) if (node == NULL)