TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-08-03 18:05:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

fuse-overlayfs: refactor code to delete a whiteout

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-07-11 11:47:34 +02:00
parent 4dd791a734
commit dbf5732c75
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
main.c
View File

@ -296,6 +296,27 @@ create_whiteout (struct ovl_data *lo, struct ovl_node *parent, const char *name)
return 0; return 0;
} }
static int
delete_whiteout (struct ovl_data *lo, int dirfd, struct ovl_node *parent, const char *name)
{
char whiteout_path[PATH_MAX + 10];
if (dirfd >= 0)
{
sprintf (whiteout_path, ".wh.%s", name);
if (unlinkat (dirfd, whiteout_path, 0) < 0 && errno != ENOENT)
return -1;
}
else
{
sprintf (whiteout_path, "%s/.wh.%s", parent->path, name);
if (unlinkat (get_upper_layer (lo)->fd, whiteout_path, 0) < 0 && errno != ENOENT)
return -1;
}
return 0;
}
static int static int
hide_node (struct ovl_data *lo, struct ovl_node *node, bool unlink_src) hide_node (struct ovl_data *lo, struct ovl_node *node, bool unlink_src)
{ {
@ -1309,11 +1330,7 @@ out:
src->layer = get_upper_layer (lo); src->layer = get_upper_layer (lo);
if (src->parent) if (src->parent)
{ delete_whiteout (lo, -1, src->parent, src->name);
char wh[PATH_MAX];
sprintf (wh, "%s/.wh.%s", src->path, src->name);
unlinkat (node_dirfd (src), wh, 0);
}
} }
return ret; return ret;
@ -1746,8 +1763,7 @@ ovl_do_open (fuse_req_t req, fuse_ino_t parent, const char *name, int flags, mod
if (p == NULL) if (p == NULL)
return -1; return -1;
sprintf (path, "%s/.wh.%s", p->path, name); if (delete_whiteout (lo, -1, p, name) < 0)
if (unlinkat (get_upper_layer (lo)->fd, path, 0) < 0 && errno != ENOENT)
return -1; return -1;
sprintf (path, "%s/%s", p->path, name); sprintf (path, "%s/%s", p->path, name);
@ -2113,8 +2129,7 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn
return; return;
} }
sprintf (path, "%s/.wh.%s", newparentnode->path, newname); if (delete_whiteout (lo, -1, newparentnode, newname) < 0)
if (unlinkat (node_dirfd (newparentnode), path, 0) < 0 && errno != ENOENT)
{ {
fuse_reply_err (req, errno); fuse_reply_err (req, errno);
return; return;
@ -2213,8 +2228,7 @@ ovl_symlink (fuse_req_t req, const char *link, fuse_ino_t parent, const char *na
return; return;
} }
sprintf (path, "%s/.wh.%s", pnode->path, name); if (delete_whiteout (lo, -1, pnode, name) < 0)
if (unlinkat (get_upper_layer (lo)->fd, path, 0) < 0 && errno != ENOENT)
{ {
fuse_reply_err (req, errno); fuse_reply_err (req, errno);
return; return;
@ -2283,7 +2297,6 @@ ovl_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
struct ovl_data *lo = ovl_data (req); struct ovl_data *lo = ovl_data (req);
int ret; int ret;
int saved_errno; int saved_errno;
char path[PATH_MAX + 1];
int srcfd = -1; int srcfd = -1;
int destfd = -1; int destfd = -1;
struct ovl_node key, *rm = NULL; struct ovl_node key, *rm = NULL;
@ -2442,8 +2455,7 @@ ovl_rename (fuse_req_t req, fuse_ino_t parent, const char *name,
goto error; goto error;
} }
sprintf (path, ".wh.%s", newname); if (delete_whiteout (lo, destfd, NULL, newname) < 0)
if (unlinkat (destfd, path, 0) < 0 && errno != ENOENT)
goto error; goto error;
error: error:
@ -2534,7 +2546,6 @@ ovl_mkdir (fuse_req_t req, fuse_ino_t parent, const char *name, mode_t mode)
struct ovl_node *pnode; struct ovl_node *pnode;
int ret = 0; int ret = 0;
char path[PATH_MAX + 10]; char path[PATH_MAX + 10];
char whiteout_path[PATH_MAX + 16];
struct fuse_entry_param e; struct fuse_entry_param e;
if (ovl_debug (req)) if (ovl_debug (req))
@ -2591,9 +2602,7 @@ ovl_mkdir (fuse_req_t req, fuse_ino_t parent, const char *name, mode_t mode)
return; return;
} }
sprintf (whiteout_path, "%s/.wh.%s", pnode->path, name); if (delete_whiteout (lo, -1, pnode, name) < 0)
ret = unlinkat (get_upper_layer (lo)->fd, whiteout_path, 0);
if (ret < 0 && errno != ENOENT)
{ {
fuse_reply_err (req, errno); fuse_reply_err (req, errno);
return; return;