From: Vivek Goyal <vgoyal@redhat.com>
To: linux-unionfs@vger.kernel.org
Cc: miklos@szeredi.hu, amir73il@gmail.com, vgoyal@redhat.com
Subject: [PATCH v10 07/18] ovl: Add mechanism to create a chain of origin dentries
Date: Mon, 22 Jan 2018 13:39:53 -0500 [thread overview]
Message-ID: <20180122184004.26026-8-vgoyal@redhat.com> (raw)
In-Reply-To: <20180122184004.26026-1-vgoyal@redhat.com>
There is a need to support metacopy dentry in midlayer. That means there
could be a chain of metacopy dentries.
For example, upper could be metacopy, midlayer lower could be metacopy and
lowest layer could be actual data inode. This means when we copy up actual
data, we should be able to reach to lowest data inode and copy up data from
there. And that means we should keep track of all the dentries in origin
chain which lead to data inode.
Current ovl_check_origin() logic only looks for one origin dentry. This patch
enhances ovl_check_origin() to continue to follow origin chain and return
all the origin entries found. This is done only if caller of the function
set "follow_chain" argument.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
fs/overlayfs/namei.c | 66 +++++++++++++++++++++++++++++++++++-----------------
1 file changed, 45 insertions(+), 21 deletions(-)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index beb945e1963c..5b834abde37a 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -283,39 +283,61 @@ static int ovl_lookup_layer(struct dentry *base, struct ovl_lookup_data *d,
return 0;
}
-
-static int ovl_check_origin(struct dentry *upperdentry,
+static int ovl_check_origin(struct dentry *dentry,
struct ovl_path *lower, unsigned int numlower,
- struct ovl_path **stackp, unsigned int *ctrp)
+ struct ovl_path **stackp, unsigned int *ctrp,
+ bool follow_chain)
{
struct vfsmount *mnt;
struct dentry *origin = NULL;
- int i;
+ int i, nr_path = (follow_chain ? numlower : 1), err = 0;
+ int idx = 0;
+ bool mem_allocated = false;
+ struct ovl_path *origin_stack;
+
+ BUG_ON(*ctrp);
+
+ if (!*stackp) {
+ origin_stack = kmalloc(sizeof(struct ovl_path) * nr_path, GFP_KERNEL);
+ if (!origin_stack)
+ return -ENOMEM;
+ mem_allocated = true;
+ } else
+ origin_stack = *stackp;
for (i = 0; i < numlower; i++) {
mnt = lower[i].layer->mnt;
- origin = ovl_get_origin(upperdentry, mnt);
- if (IS_ERR(origin))
- return PTR_ERR(origin);
+ origin = ovl_get_origin(dentry, mnt);
+ if (IS_ERR(origin)) {
+ err = PTR_ERR(origin);
+ goto out_err;
+ }
- if (origin)
- break;
+ if (origin) {
+ origin_stack[idx++] = (struct ovl_path){.dentry = origin, .layer = lower[i].layer};
+ if (!follow_chain)
+ break;
+ else
+ dentry = origin;
+ }
}
- if (!origin)
+ if (mem_allocated && !idx) {
+ kfree(origin_stack);
return 0;
-
- BUG_ON(*ctrp);
- if (!*stackp)
- *stackp = kmalloc(sizeof(struct ovl_path), GFP_KERNEL);
- if (!*stackp) {
- dput(origin);
- return -ENOMEM;
}
- **stackp = (struct ovl_path){.dentry = origin, .layer = lower[i].layer};
- *ctrp = 1;
+ *stackp = origin_stack;
+ *ctrp = idx;
return 0;
+out_err:
+ for (i = 0; i < idx; i++)
+ dput(origin_stack[i].dentry);
+
+ if (mem_allocated)
+ kfree(origin_stack);
+
+ return err;
}
/*
@@ -427,7 +449,7 @@ int ovl_verify_index(struct dentry *index, struct ovl_path *lower,
if (err)
goto fail;
- err = ovl_check_origin(index, lower, numlower, &stack, &ctr);
+ err = ovl_check_origin(index, lower, numlower, &stack, &ctr, false);
if (!err && !ctr)
err = -ESTALE;
if (err)
@@ -602,6 +624,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
struct dentry *this;
unsigned int i;
int err;
+ bool origin_chain = ofs->config.metacopy ? true : false;
struct ovl_lookup_data d = {
.name = dentry->d_name,
.is_dir = false,
@@ -639,7 +662,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
* to a dentry in lower layer that was moved under us.
*/
err = ovl_check_origin(upperdentry, roe->lowerstack,
- roe->numlower, &stack, &ctr);
+ roe->numlower, &stack, &ctr,
+ origin_chain);
if (err)
goto out_put_upper;
}
--
2.13.6
next prev parent reply other threads:[~2018-01-22 18:40 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 18:39 [PATCH v10 00/18] overlayfs: Delayed copy up of data Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 01/18] ovl: Do not look for OVL_XATTR_NLINK if index is not there Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 02/18] ovl: disable redirect_dir and index when no xattr support Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 03/18] ovl: Create origin xattr on copy up for all files Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 04/18] ovl: Provide a mount option metacopy=on/off for metadata copyup Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 05/18] ovl: During copy up, first copy up metadata and then data Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 06/18] ovl: Move the copy up helpers to copy_up.c Vivek Goyal
2018-01-22 18:39 ` Vivek Goyal [this message]
2018-01-22 19:34 ` [PATCH v10 07/18] ovl: Add mechanism to create a chain of origin dentries Amir Goldstein
2018-01-22 19:46 ` Amir Goldstein
2018-01-23 13:45 ` Vivek Goyal
2018-01-23 13:47 ` Amir Goldstein
2018-01-23 14:13 ` Vivek Goyal
2018-01-30 19:33 ` Vivek Goyal
2018-01-30 20:03 ` Amir Goldstein
2018-01-30 20:05 ` Amir Goldstein
2018-01-30 20:15 ` Vivek Goyal
2018-01-30 21:01 ` Amir Goldstein
2018-01-30 20:06 ` Vivek Goyal
2018-01-23 13:40 ` Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 08/18] ovl: Copy up only metadata during copy up where it makes sense Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 09/18] ovl: Add helper ovl_already_copied_up() Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 10/18] ovl: A new xattr OVL_XATTR_METACOPY for file on upper Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 11/18] ovl: Set OVL_UPPERDATA flag during ovl_lookup() Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 12/18] ovl: Setup origin chain for lower regular files Vivek Goyal
2018-01-22 18:39 ` [PATCH v10 13/18] ovl: Check metacopy attributes on a chain of origin Vivek Goyal
2018-01-22 18:40 ` [PATCH v10 14/18] ovl: Do not mark a non dir as _OVL_PATH_MERGE in ovl_path_type() Vivek Goyal
2018-01-22 18:40 ` [PATCH v10 15/18] ovl: Copy up meta inode data from lowest data inode Vivek Goyal
2018-01-22 18:40 ` [PATCH v10 16/18] ovl: Fix ovl_getattr() to get number of blocks from lower Vivek Goyal
2018-01-22 18:40 ` [PATCH v10 17/18] ovl: Do not expose metacopy only upper dentry from d_real() Vivek Goyal
2018-01-22 18:40 ` [PATCH v10 18/18] ovl: Enable metadata only feature Vivek Goyal
2018-01-24 9:05 ` [PATCH v10 00/18] overlayfs: Delayed copy up of data Miklos Szeredi
2018-01-27 16:38 ` Amir Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180122184004.26026-8-vgoyal@redhat.com \
--to=vgoyal@redhat.com \
--cc=amir73il@gmail.com \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox