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

main: add option to skip ino number check in lower layers

Browse Source 
if specified, as soon as a file is found the lookup is completed
without looking up the correct ino number in the lower layers.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-07-15 10:34:47 +02:00
parent dc36739d0f
commit 27f8f6c1f5
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.c
View File

@ -241,6 +241,7 @@ struct ovl_data
double timeout; double timeout;
int threaded; int threaded;
int fsync; int fsync;
int fast_ino_check;
}; };
static double static double
@ -270,6 +271,8 @@ static const struct fuse_opt ovl_opts[] = {
offsetof (struct ovl_data, threaded), 0}, offsetof (struct ovl_data, threaded), 0},
{"fsync=%d", {"fsync=%d",
offsetof (struct ovl_data, fsync), 1}, offsetof (struct ovl_data, fsync), 1},
{"fast_ino=%d",
offsetof (struct ovl_data, fast_ino_check), 0},
FUSE_OPT_END FUSE_OPT_END
}; };
@ -1028,7 +1031,7 @@ safe_read_xattr (char **ret, int sfd, const char *name, size_t initial_size)
} }
static struct ovl_node * static struct ovl_node *
make_ovl_node (const char *path, struct ovl_layer *layer, const char *name, ino_t ino, bool dir_p, struct ovl_node *parent) make_ovl_node (const char *path, struct ovl_layer *layer, const char *name, ino_t ino, bool dir_p, struct ovl_node *parent, bool fast_ino_check)
{ {
char *new_name; char *new_name;
struct ovl_node *ret_xchg; struct ovl_node *ret_xchg;
@ -1130,6 +1133,8 @@ make_ovl_node (const char *path, struct ovl_layer *layer, const char *name, ino_
if (parent && parent->last_layer == it) if (parent && parent->last_layer == it)
break; break;
if (fast_ino_check)
break;
} }
} }
@ -1197,7 +1202,7 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
if (!n) if (!n)
{ {
n = make_ovl_node (path, layer, name, 0, true, NULL); n = make_ovl_node (path, layer, name, 0, true, NULL, lo->fast_ino_check);
if (n == NULL) if (n == NULL)
{ {
errno = ENOMEM; errno = ENOMEM;
@ -1258,6 +1263,8 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
child->present_lowerdir = 1; child->present_lowerdir = 1;
continue; continue;
} }
if (lo->fast_ino_check)
continue;
} }
strconcat3 (whiteout_path, PATH_MAX, ".wh.", dent->d_name, NULL); strconcat3 (whiteout_path, PATH_MAX, ".wh.", dent->d_name, NULL);
@ -1309,7 +1316,7 @@ load_dir (struct ovl_data *lo, struct ovl_node *n, struct ovl_layer *layer, char
else else
{ {
child = make_ovl_node (node_path, it, dent->d_name, 0, dirp, n); child = make_ovl_node (node_path, it, dent->d_name, 0, dirp, n, lo->fast_ino_check);
if (child == NULL) if (child == NULL)
{ {
errno = ENOMEM; errno = ENOMEM;
@ -1500,7 +1507,7 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
if (wh_name) if (wh_name)
node = make_whiteout_node (path, wh_name); node = make_whiteout_node (path, wh_name);
else else
node = make_ovl_node (path, it, name, 0, st.st_mode & S_IFDIR, pnode); node = make_ovl_node (path, it, name, 0, st.st_mode & S_IFDIR, pnode, lo->fast_ino_check);
} }
if (node == NULL) if (node == NULL)
{ {
@ -1530,6 +1537,9 @@ insert_node:
break; break;
if (pnode && pnode->last_layer == it) if (pnode && pnode->last_layer == it)
break; break;
if (lo->fast_ino_check)
break;
} }
} }
@ -2701,7 +2711,7 @@ ovl_do_open (fuse_req_t req, fuse_ino_t parent, const char *name, int flags, mod
return -1; return -1;
} }
n = make_ovl_node (path, get_upper_layer (lo), name, 0, false, p); n = make_ovl_node (path, get_upper_layer (lo), name, 0, false, p, lo->fast_ino_check);
if (n == NULL) if (n == NULL)
{ {
errno = ENOMEM; errno = ENOMEM;
@ -3101,7 +3111,7 @@ ovl_link (fuse_req_t req, fuse_ino_t ino, fuse_ino_t newparent, const char *newn
} }
} }
node = make_ovl_node (path, get_upper_layer (lo), newname, node->ino, false, newparentnode); node = make_ovl_node (path, get_upper_layer (lo), newname, node->ino, false, newparentnode, lo->fast_ino_check);
if (node == NULL) if (node == NULL)
{ {
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
@ -3205,7 +3215,7 @@ ovl_symlink (fuse_req_t req, const char *link, fuse_ino_t parent, const char *na
return; return;
} }
node = make_ovl_node (path, get_upper_layer (lo), name, 0, false, pnode); node = make_ovl_node (path, get_upper_layer (lo), name, 0, false, pnode, lo->fast_ino_check);
if (node == NULL) if (node == NULL)
{ {
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
@ -3755,7 +3765,7 @@ ovl_mknod (fuse_req_t req, fuse_ino_t parent, const char *name, mode_t mode, dev
return; return;
} }
node = make_ovl_node (path, get_upper_layer (lo), name, 0, false, pnode); node = make_ovl_node (path, get_upper_layer (lo), name, 0, false, pnode, lo->fast_ino_check);
if (node == NULL) if (node == NULL)
{ {
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);
@ -3842,7 +3852,7 @@ ovl_mkdir (fuse_req_t req, fuse_ino_t parent, const char *name, mode_t mode)
return; return;
} }
node = make_ovl_node (path, get_upper_layer (lo), name, 0, true, pnode); node = make_ovl_node (path, get_upper_layer (lo), name, 0, true, pnode, lo->fast_ino_check);
if (node == NULL) if (node == NULL)
{ {
fuse_reply_err (req, ENOMEM); fuse_reply_err (req, ENOMEM);