public inbox for linux-unionfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Vivek Goyal <vgoyal@redhat.com>
To: linux-unionfs@vger.kernel.org
Cc: miklos@szeredi.hu, amir73il@gmail.com, vgoyal@redhat.com
Subject: [PATCH v11 12/18] ovl: Get and install lower most data dentry in stack
Date: Wed, 31 Jan 2018 16:13:23 -0500	[thread overview]
Message-ID: <20180131211329.16328-13-vgoyal@redhat.com> (raw)
In-Reply-To: <20180131211329.16328-1-vgoyal@redhat.com>

Now we want to support midlayer metacopy dentry as well. To support that
we need to find out lowest data dentry and keep track of that too so that
later it can be used for data copy up.

Introduce logic to traverse through metacopies and find and install the
lowest data ovl_path in stack.

This patch does it only for upper dentry at this point of time. Next patch
will introduce this logic for the cases when upper does not exist.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 fs/overlayfs/namei.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 3 deletions(-)

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index ddb73b5a06d4..e26c0bdf0381 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -205,7 +205,7 @@ static int ovl_check_metacopy_xattr(struct dentry *dentry)
 }
 
 static int ovl_check_metacopy(struct ovl_fs *ofs, struct dentry *dentry,
-			      unsigned int ctr)
+			      unsigned int numlower, bool is_upper)
 {
 	int metacopy;
 
@@ -213,7 +213,7 @@ static int ovl_check_metacopy(struct ovl_fs *ofs, struct dentry *dentry,
 	if (metacopy <= 0 )
 		return metacopy;
 
-	if (!ctr) {
+	if (is_upper && !numlower) {
 		/*
 		 * Found a upper dentry with metacopy set but at the same
 		 * time there is no corresponding origin dentry. Something
@@ -236,6 +236,77 @@ static int ovl_check_metacopy(struct ovl_fs *ofs, struct dentry *dentry,
 	return metacopy;
 }
 
+/*
+ * Returns < 0 upon error, 0 if dentry does not have metacopy xattr, 1 if
+ * dentry has metacopy xattr.
+ */
+static int ovl_get_metacopy_chain(struct ovl_fs *ofs,
+			      struct dentry *upperdentry,
+			      struct ovl_path *lower, unsigned int numlower,
+			      struct ovl_path *stackp, unsigned int *ctrp)
+{
+	int metacopy = 0, i, err;
+	struct dentry *origin = NULL, *parent;
+	struct vfsmount *mnt;
+
+	if (upperdentry) {
+		metacopy = ovl_check_metacopy(ofs, upperdentry, *ctrp, true);
+		if (metacopy <= 0 )
+			return metacopy;
+	}
+
+	/*
+	 * Expecting one dentry in stackp[0] and lowest data will be installed
+	 * at stackp[1], if appropriate./
+	 */
+	BUG_ON(*ctrp != 1);
+	err = ovl_check_metacopy(ofs, stackp[0].dentry, *ctrp, false);
+	if (err < 0)
+		return err;
+
+	if (!err)
+		return metacopy;
+
+	parent = stackp[0].dentry;
+	dget(parent);
+
+	/* Get the data dentry corresponding to metacopy dentry */
+	for (i = 0; i < numlower; i++) {
+		mnt = lower[i].layer->mnt;
+		origin = ovl_get_origin(parent, mnt);
+		if (IS_ERR(origin)) {
+			dput(parent);
+			return PTR_ERR(origin);
+		}
+
+		if (origin) {
+			err = ovl_check_metacopy_xattr(origin);
+			if (err < 0) {
+				dput(parent);
+				dput(origin);
+				return err;
+			}
+
+			if (err) {
+				dput(parent);
+				parent = origin;
+				origin = NULL;
+				continue;
+			}
+			break;
+		}
+	}
+
+	dput(parent);
+	if (!origin)
+		return -ESTALE;
+
+	stackp[1].dentry = origin;
+	stackp[1].layer = lower[i].layer;
+	*ctrp += 1;
+	return 1;
+}
+
 static bool ovl_is_opaquedir(struct dentry *dentry)
 {
 	return ovl_check_dir_xattr(dentry, OVL_XATTR_OPAQUE);
@@ -699,7 +770,10 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
 			if (err)
 				goto out_put_upper;
 
-			err = ovl_check_metacopy(ofs, upperdentry, ctr);
+			err = ovl_get_metacopy_chain(ofs, upperdentry,
+						     roe->lowerstack,
+						     roe->numlower, stack,
+						     &ctr);
 			metacopy = err;
 			if (err < 0)
 				goto out_put_upper;
-- 
2.13.6

  parent reply	other threads:[~2018-01-31 21:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-31 21:13 [PATCH v11 00/18] overlayfs: Delayed copy up of data Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 01/18] ovl: Do not look for OVL_XATTR_NLINK if index is not there Vivek Goyal
2018-01-31 23:52   ` Amir Goldstein
2018-01-31 21:13 ` [PATCH v11 02/18] ovl: disable redirect_dir and index when no xattr support Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 03/18] ovl: Create origin xattr on copy up for all files Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 04/18] ovl: Provide a mount option metacopy=on/off for metadata copyup Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 05/18] ovl: During copy up, first copy up metadata and then data Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 06/18] ovl: Move the copy up helpers to copy_up.c Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 07/18] ovl: Copy up only metadata during copy up where it makes sense Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 08/18] ovl: Add helper ovl_already_copied_up() Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 09/18] ovl: A new xattr OVL_XATTR_METACOPY for file on upper Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 10/18] ovl: Set OVL_UPPERDATA flag during ovl_lookup() Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 11/18] ovl: Allocate bigger stack for origin Vivek Goyal
2018-02-01  0:07   ` Amir Goldstein
2018-02-01  0:38     ` Vivek Goyal
2018-01-31 21:13 ` Vivek Goyal [this message]
2018-02-01  0:05   ` [PATCH v11 12/18] ovl: Get and install lower most data dentry in stack Amir Goldstein
2018-01-31 21:13 ` [PATCH v11 13/18] ovl: Setup origin chain for lower regular files Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 14/18] ovl: Do not mark a non dir as _OVL_PATH_MERGE in ovl_path_type() Vivek Goyal
2018-01-31 23:51   ` Amir Goldstein
2018-01-31 21:13 ` [PATCH v11 15/18] ovl: Copy up meta inode data from lowest data inode Vivek Goyal
2018-01-31 23:48   ` Amir Goldstein
2018-01-31 21:13 ` [PATCH v11 16/18] ovl: Fix ovl_getattr() to get number of blocks from lower Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 17/18] ovl: Do not expose metacopy only upper dentry from d_real() Vivek Goyal
2018-01-31 21:13 ` [PATCH v11 18/18] ovl: Enable metadata only feature Vivek Goyal
2018-01-31 23:41 ` [PATCH v11 00/18] overlayfs: Delayed copy up of data 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=20180131211329.16328-13-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