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

main: drop nlink optimization

Browse Source 
calculate the nlink for the directory on each stat.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-03-16 09:26:04 +01:00
parent da13832baa
commit f703870668
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuse-overlayfs.h
View File

@ -33,7 +33,6 @@ struct ovl_ino
dev_t dev; dev_t dev;
int lookups; int lookups;
mode_t mode; mode_t mode;
int nlinks;
}; };
struct ovl_node struct ovl_node

11
main.c
View File

@ -701,7 +701,7 @@ rpl_stat (fuse_req_t req, struct ovl_node *node, int fd, const char *path, struc
st->st_ino = node->tmp_ino; st->st_ino = node->tmp_ino;
st->st_dev = node->tmp_dev; st->st_dev = node->tmp_dev;
if (ret == 0 && node_dirp (node) && node->ino->nlinks <= 0) if (ret == 0 && node_dirp (node))
{ {
struct ovl_node *it; struct ovl_node *it;
@ -712,7 +712,6 @@ rpl_stat (fuse_req_t req, struct ovl_node *node, int fd, const char *path, struc
if (node_dirp (it)) if (node_dirp (it))
st->st_nlink++; st->st_nlink++;
} }
node->ino->nlinks = st->st_nlink;
} }
return ret; return ret;
@ -1347,20 +1346,14 @@ insert_node (struct ovl_node *parent, struct ovl_node *item, bool replace)
{ {
if (hash_lookup (prev_parent->children, item) == item) if (hash_lookup (prev_parent->children, item) == item)
hash_delete (prev_parent->children, item); hash_delete (prev_parent->children, item);
if (is_dir)
prev_parent->ino->nlinks--;
} }
if (replace) if (replace)
{ {
old = hash_delete (parent->children, item); old = hash_delete (parent->children, item);
if (old) if (old)
{
if (node_dirp (old))
parent->ino->nlinks--;
node_free (old); node_free (old);
} }
}
ret = hash_insert_if_absent (parent->children, item, (const void **) &old); ret = hash_insert_if_absent (parent->children, item, (const void **) &old);
if (ret < 0) if (ret < 0)
@ -1376,8 +1369,6 @@ insert_node (struct ovl_node *parent, struct ovl_node *item, bool replace)
} }
item->parent = parent; item->parent = parent;
if (is_dir)
parent->ino->nlinks++;
return item; return item;
} }

24
tests/fedora-installs.sh
View File

@ -145,3 +145,27 @@ test -e merged/a/test
ls -l merged/b ls -l merged/b
test -e merged/b/test test -e merged/b/test
#### Correct number of directory nlink
umount merged
rm -rf lower upper workdir merged
mkdir lower upper workdir merged
mkdir lower/a lower/a/1 lower/a/2 lower/a/3
fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir merged
test $(stat -c %h merged/a) = 5
mkdir merged/a/4
test $(stat -c %h merged/a) = 6
rm -rf merged/a/4
test $(stat -c %h merged/a) = 5
rm -rf merged/a/3
test $(stat -c %h merged/a) = 4