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

main: fix fast_ino

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-10-21 17:39:27 +02:00
parent 62abdcf00f
commit 7095cc29ef
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.c
View File

@ -1200,11 +1200,12 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
cleanup_free char *origin = NULL;
cleanup_close int fd = -1;
fd = it->ds->openat (it, npath, O_RDONLY|O_NONBLOCK|O_NOFOLLOW, 0755);
if (! fast_ino_check)
fd = it->ds->openat (it, npath, O_RDONLY|O_NONBLOCK|O_NOFOLLOW, 0755);
if (fd < 0)
{
if (errno != EPERM && it->ds->statat (it, npath, &st, AT_SYMLINK_NOFOLLOW, STATX_TYPE|STATX_MODE|STATX_INO) == 0)
if (it->ds->statat (it, npath, &st, AT_SYMLINK_NOFOLLOW, STATX_TYPE|STATX_MODE|STATX_INO) == 0)
{
ret->tmp_ino = st.st_ino;
ret->tmp_dev = st.st_dev;
@ -1275,8 +1276,6 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
no_fd:
if (parent && parent->last_layer == it)
break;
if (fast_ino_check)
break;
}
}
@ -1407,9 +1406,6 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
node_free (child);
child = NULL;
}
if (lo->fast_ino_check)
continue;
}
strconcat3 (whiteout_path, PATH_MAX, ".wh.", dent->d_name, NULL);
@ -1469,7 +1465,12 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
}
else
{
child = make_ovl_node (lo, node_path, it, dent->d_name, 0, 0, dirp, n, lo->fast_ino_check);
ino_t ino = 0;
if (lo->fast_ino_check)
ino = dent->d_ino;
child = make_ovl_node (lo, node_path, it, dent->d_name, ino, 0, dirp, n, lo->fast_ino_check);
if (child == NULL)
{
errno = ENOMEM;
@ -1761,8 +1762,6 @@ insert_node:
if (pnode && pnode->last_layer == it)
break;
if (lo->fast_ino_check)
break;
}
}