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

containerfs: some cleanups

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-06-28 09:40:52 +02:00
parent a80ef88cf9
commit 278069ae79
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 71 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
main.c
View File

@ -200,7 +200,7 @@ static int
hide_node (struct lo_data *lo, struct lo_node *node) hide_node (struct lo_data *lo, struct lo_node *node)
{ {
char dest[PATH_MAX]; char dest[PATH_MAX];
char *src = node->path; char *newpath;
int ret; int ret;
node->hidden = 1; node->hidden = 1;
@ -213,19 +213,20 @@ hide_node (struct lo_data *lo, struct lo_node *node)
close (ret); close (ret);
node->path = strdup (dest); newpath = strdup (dest);
if (node->path == NULL) if (newpath == NULL)
{ {
unlink (dest); unlink (dest);
free (src);
return -1; return -1;
} }
if (rename (src, node->path) < 0) if (rename (node->path, newpath) < 0)
{ {
free (src); free (newpath);
unlink (dest);
return -1; return -1;
} }
free (src); free (node->path);
node->path = newpath;
node->do_unlink = 1; node->do_unlink = 1;
return 0; return 0;
@ -312,6 +313,7 @@ node_free (void *p)
for (it = hash_get_first (n->children); it; it = hash_get_next (n->children, it)) for (it = hash_get_first (n->children); it; it = hash_get_next (n->children, it))
it->parent = NULL; it->parent = NULL;
hash_free (n->children); hash_free (n->children);
n->children = NULL; n->children = NULL;
} }
@ -325,9 +327,7 @@ node_free (void *p)
} }
free (n->name); free (n->name);
n->name = NULL;
free (n->path); free (n->path);
n->path = NULL;
free (n); free (n);
} }
@ -442,14 +442,22 @@ insert_node (struct lo_node *parent, struct lo_node *item, bool replace)
int ret; int ret;
if (prev_parent) if (prev_parent)
{
if (hash_lookup (prev_parent->children, item) == item)
hash_delete (prev_parent->children, item); hash_delete (prev_parent->children, item);
}
if (replace) if (replace)
hash_delete (parent->children, item); {
old = hash_delete (parent->children, item);
if (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)
{ {
node_free (item);
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }
@ -506,7 +514,8 @@ traverse_dir (char * const dir, struct lo_node *lower, bool low)
if (n == NULL) if (n == NULL)
goto err; goto err;
parent = (struct lo_node *) ent->fts_parent->fts_pointer; parent = (struct lo_node *) ent->fts_parent->fts_pointer;
if (insert_node (parent, n, false) == NULL) n = insert_node (parent, n, false);
if (n == NULL)
goto err; goto err;
n->low = low ? 1 : 0; n->low = low ? 1 : 0;
} }
@ -524,7 +533,8 @@ traverse_dir (char * const dir, struct lo_node *lower, bool low)
goto err; goto err;
n->low = low ? 1 : 0; n->low = low ? 1 : 0;
parent = (struct lo_node *) ent->fts_parent->fts_pointer; parent = (struct lo_node *) ent->fts_parent->fts_pointer;
if (insert_node (parent, n, true) == NULL) n = insert_node (parent, n, true);
if (n == NULL)
goto err; goto err;
break; break;
} }
@ -569,7 +579,8 @@ merge_trees (struct lo_node *origin, struct lo_node *new)
if (!node_dirp (origin) || !node_dirp (new)) if (!node_dirp (origin) || !node_dirp (new))
{ {
if (insert_node (origin->parent, new, true) == NULL) new = insert_node (origin->parent, new, true);
if (new == NULL)
return NULL; return NULL;
return origin; return origin;
} }
@ -612,7 +623,8 @@ merge_trees (struct lo_node *origin, struct lo_node *new)
else else
{ {
hash_delete (new->children, it); hash_delete (new->children, it);
if (insert_node (origin, it, true) == NULL) it = insert_node (origin, it, true);
if (it == NULL)
{ {
free (children); free (children);
return NULL; return NULL;
@ -653,11 +665,17 @@ reload_dir (struct lo_node *n, char *path, char *name, struct lo_node *lowerdir)
n->lowerdir = lowerdir; n->lowerdir = lowerdir;
dp = opendir (path); dp = opendir (path);
if (dp == NULL) if (dp == NULL)
{
if (created)
node_free (created);
return NULL; return NULL;
}
whiteouts = hash_initialize (10, NULL, str_hasher, str_compare, free); whiteouts = hash_initialize (10, NULL, str_hasher, str_compare, free);
if (whiteouts == NULL) if (whiteouts == NULL)
{ {
if (created)
node_free (created);
closedir (dp); closedir (dp);
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
@ -692,6 +710,8 @@ reload_dir (struct lo_node *n, char *path, char *name, struct lo_node *lowerdir)
errno = ENOMEM; errno = ENOMEM;
closedir (dp); closedir (dp);
hash_free (whiteouts); hash_free (whiteouts);
if (created)
node_free (created);
return NULL; return NULL;
} }
tmp = hash_insert (whiteouts, name); tmp = hash_insert (whiteouts, name);
@ -701,6 +721,8 @@ reload_dir (struct lo_node *n, char *path, char *name, struct lo_node *lowerdir)
errno = ENOMEM; errno = ENOMEM;
closedir (dp); closedir (dp);
hash_free (whiteouts); hash_free (whiteouts);
if (created)
node_free (created);
return NULL; return NULL;
} }
continue; continue;
@ -716,12 +738,10 @@ reload_dir (struct lo_node *n, char *path, char *name, struct lo_node *lowerdir)
if (dirp) if (dirp)
child->dirty = 1; child->dirty = 1;
if (insert_node (n, child, false) == NULL) child = insert_node (n, child, false);
{ if (child == NULL)
node_free (child);
goto err; goto err;
} }
}
closedir (dp); closedir (dp);
for (it = hash_get_first (whiteouts); it; it = hash_get_next (whiteouts, it)) for (it = hash_get_first (whiteouts); it; it = hash_get_next (whiteouts, it))
@ -1000,6 +1020,7 @@ lo_opendir (fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
i = hash_insert (d->elements, el); i = hash_insert (d->elements, el);
if (i == NULL) if (i == NULL)
{ {
free (el);
errno = ENOMEM; errno = ENOMEM;
goto out_errno; goto out_errno;
} }
@ -1792,16 +1813,17 @@ lo_do_open (fuse_req_t req, fuse_ino_t parent, const char *name, int flags, mode
{ {
p->dirty = 1; p->dirty = 1;
errno = ENOMEM; errno = ENOMEM;
close (fd);
return -1; return -1;
} }
if (insert_node (p, n, true) == NULL) n = insert_node (p, n, true);
if (n == NULL)
{ {
p->dirty = 1; p->dirty = 1;
node_free (n);
errno = ENOMEM; errno = ENOMEM;
close (fd);
return -1; return -1;
} }
return fd; return fd;
} }
@ -2142,9 +2164,10 @@ lo_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newna
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }
if (insert_node (newparentnode, node, true) == NULL)
node = insert_node (newparentnode, node, true);
if (node == NULL)
{ {
node_free (node);
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }
@ -2219,9 +2242,10 @@ lo_symlink (fuse_req_t req, const char *link, fuse_ino_t parent, const char *nam
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }
if (insert_node (pnode, node, true) == NULL)
node = insert_node (pnode, node, true);
if (node == NULL)
{ {
node_free (node);
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }
@ -2242,8 +2266,8 @@ lo_symlink (fuse_req_t req, const char *link, fuse_ino_t parent, const char *nam
fuse_reply_entry (req, &e); fuse_reply_entry (req, &e);
} }
static static void
void lo_flock (fuse_req_t req, fuse_ino_t ino, lo_flock (fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi, int op) struct fuse_file_info *fi, int op)
{ {
int ret, fd; int ret, fd;
@ -2259,19 +2283,19 @@ void lo_flock (fuse_req_t req, fuse_ino_t ino,
} }
/* used to recover a failed lo_rename. */ /* used to recover a failed lo_rename. */
static void static struct lo_node *
unhide_node (struct lo_node *node, struct lo_node *parent) unhide_node (struct lo_node *node, struct lo_node *parent)
{ {
char b[PATH_MAX]; char b[PATH_MAX];
if (node->path == NULL) if (node->path == NULL)
return; return node;
sprintf (b, "%s/%s", parent->path, node->name); sprintf (b, "%s/%s", parent->path, node->name);
rename (node->path, b); rename (node->path, b);
free (node->path); free (node->path);
node->path = strdup (b); node->path = strdup (b);
insert_node (parent, node, true); return insert_node (parent, node, true);
} }
static struct lo_node * static struct lo_node *
@ -2394,18 +2418,16 @@ lo_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
{ {
if (hide_node (lo, rm) < 0) if (hide_node (lo, rm) < 0)
goto error; goto error;
} hash_delete (destpnode->children, rm);
hash_delete (destpnode->children, &key);
if (rm)
node_free (rm); node_free (rm);
} }
}
ret = syscall (SYS_renameat2, srcfd, name, destfd, newname, flags); ret = syscall (SYS_renameat2, srcfd, name, destfd, newname, flags);
if (ret < 0) if (ret < 0)
{ {
if (rm) if (rm)
unhide_node (rm, destpnode); destpnode = unhide_node (rm, destpnode);
pnode->dirty = destpnode->dirty = 1; pnode->dirty = destpnode->dirty = 1;
goto error; goto error;
@ -2427,13 +2449,15 @@ lo_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
node->name = destnode->name; node->name = destnode->name;
destnode->name = tmp; destnode->name = tmp;
if (insert_node (destpnode, node, true) == NULL) node = insert_node (destpnode, node, true);
if (node == NULL)
{ {
node_free (rm1); node_free (rm1);
node_free (rm2); node_free (rm2);
goto error; goto error;
} }
if (insert_node (pnode, destnode, true) == NULL) destnode = insert_node (pnode, destnode, true);
if (destnode == NULL)
{ {
node_free (rm1); node_free (rm1);
node_free (rm2); node_free (rm2);
@ -2452,15 +2476,15 @@ lo_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
goto error; goto error;
close (fd); close (fd);
key.name = (char *) name; hash_delete (pnode->children, node);
hash_delete (pnode->children, &key);
free (node->name); free (node->name);
node->name = strdup (newname); node->name = strdup (newname);
if (node->name == NULL) if (node->name == NULL)
goto error; goto error;
if (insert_node (destpnode, node, true) == NULL) node = insert_node (destpnode, node, true);
if (node == NULL)
goto error; goto error;
if (update_paths (node) < 0) if (update_paths (node) < 0)
goto error; goto error;
@ -2608,9 +2632,10 @@ lo_mkdir (fuse_req_t req, fuse_ino_t parent, const char *name, mode_t mode)
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }
if (insert_node (pnode, node, true) == NULL)
node = insert_node (pnode, node, true);
if (node == NULL)
{ {
node_free (node);
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
return; return;
} }