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

fuse-overlayfs: fix lookup with multiple layers

Browse Source 
when looking up multiple layers and we have already found a file, do
not check if whiteouts are present in lower layers.  The lookup in the
lower layers is needed only to correctly propagate the inode number.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1686889

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-03-08 18:09:04 +01:00
parent ea72572364
commit 44d23bc07e
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -1220,6 +1220,9 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
if (errno == ENOENT) if (errno == ENOENT)
{ {
if (node)
continue;
ret = asprintf (&whpath, "%s/.wh.%s", pnode->path, name); ret = asprintf (&whpath, "%s/.wh.%s", pnode->path, name);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
@ -1239,31 +1242,18 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
} }
continue; continue;
} }
if (node)
node_free (node);
errno = saved_errno; errno = saved_errno;
return NULL; return NULL;
} }
/* If we already know the node, simply update the ino. */ /* If we already know the node, simply update the ino. */
if (node) if (node)
{
if (node->whiteout && it == upper_layer)
{
hash_delete (pnode->children, node);
node_free (node);
node = NULL;
}
else
{ {
node->ino = st.st_ino; node->ino = st.st_ino;
if (it->low) if (it->low)
node->present_lowerdir = 1; node->present_lowerdir = 1;
continue; continue;
} }
}
if (whpath == NULL) if (whpath == NULL)
{ {