From 3a31451fe34b56b243b98301cbf590dc3a37baa6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 3 Oct 2019 15:16:37 +0200 Subject: [PATCH] main: skip whiteout creation if not needed if the file is present only on the upper layer, do not create a whiteout when it is created. Previously it was looking only at the parent directory. Signed-off-by: Giuseppe Scrivano --- main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 074f2c1..591aa9b 100644 --- a/main.c +++ b/main.c @@ -979,8 +979,7 @@ hide_node (struct ovl_data *lo, struct ovl_node *node, bool unlink_src) bool whiteout_created = false; 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 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; return -1; } + if (!is_whiteout) + n->last_layer = get_upper_layer (lo); + n = insert_node (p, n, true); if (n == NULL) { @@ -3686,6 +3688,8 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn fuse_reply_err (req, ENOMEM); return; } + if (destnode && !destnode->whiteout) + node->last_layer = get_upper_layer (lo); node = insert_node (newparentnode, node, true); if (node == NULL)