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

fuse-overlayfs: attempt to create mknod whiteout before attempting the .wh. fallback

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2018-07-11 16:57:59 +02:00
parent 0d02ef15ce
commit 81c939f350
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
main.c
View File

@ -286,6 +286,23 @@ create_whiteout (struct ovl_data *lo, struct ovl_node *parent, const char *name)
{ {
char whiteout_path[PATH_MAX + 10]; char whiteout_path[PATH_MAX + 10];
int fd = -1; int fd = -1;
static bool can_mknod = true;
if (can_mknod)
{
int ret;
sprintf (whiteout_path, "%s/%s", parent->path, name);
ret = mknodat (get_upper_layer (lo)->fd, whiteout_path, S_IFCHR|0700, makedev (0, 0));
if (ret == 0)
return 0;
if (errno != EPERM)
return -1;
/* if it fails with EPERM then do not attempt mknod again. */
can_mknod = false;
}
sprintf (whiteout_path, "%s/.wh.%s", parent->path, name); sprintf (whiteout_path, "%s/.wh.%s", parent->path, name);
fd = TEMP_FAILURE_RETRY (openat (get_upper_layer (lo)->fd, whiteout_path, O_CREAT|O_WRONLY, 0700)); fd = TEMP_FAILURE_RETRY (openat (get_upper_layer (lo)->fd, whiteout_path, O_CREAT|O_WRONLY, 0700));
@ -1614,23 +1631,27 @@ do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
return; return;
} }
ret = create_whiteout (lo, pnode, name); key.name = (char *) name;
rm = hash_delete (pnode->children, &key);
if (rm)
{
ret = hide_node (lo, rm, true);
if (ret < 0) if (ret < 0)
{ {
fuse_reply_err (req, errno); fuse_reply_err (req, errno);
return; return;
} }
ret = 0;
key.name = (char *) name;
rm = hash_delete (pnode->children, &key);
if (rm)
{
hide_node (lo, rm, true);
node_free (rm); node_free (rm);
} }
ret = create_whiteout (lo, pnode, name);
if (ret < 0)
{
fuse_reply_err (req, errno);
return;
}
fuse_reply_err (req, ret); fuse_reply_err (req, ret);
} }