All of lore.kernel.org
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
	linux-unionfs@vger.kernel.org
Subject: [PATCH v3 1/5] ovl: relax same fs constrain for ovl_check_origin()
Date: Thu,  1 Jun 2017 12:02:55 +0300	[thread overview]
Message-ID: <1496307779-2766-2-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1496307779-2766-1-git-send-email-amir73il@gmail.com>

For the case of all layers not on the same fs, try to decode the copy up
origin file handle on any of the lower layers.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 fs/overlayfs/namei.c | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index f3136c31e72a..04b3d6cf4148 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -272,28 +272,24 @@ static int ovl_lookup_layer(struct dentry *base, struct ovl_lookup_data *d,
 static int ovl_check_origin(struct dentry *dentry, struct dentry *upperdentry,
 			    struct path **stackp, unsigned int *ctrp)
 {
-	struct super_block *same_sb = ovl_same_sb(dentry->d_sb);
 	struct ovl_entry *roe = dentry->d_sb->s_root->d_fsdata;
 	struct vfsmount *mnt;
-	struct dentry *origin;
+	struct dentry *origin = NULL;
+	int i;
 
-	if (!same_sb || !roe->numlower)
-		return 0;
 
-       /*
-	* Since all layers are on the same fs, we use the first layer for
-	* decoding the file handle.  We may get a disconnected dentry,
-	* which is fine, because we only need to hold the origin inode in
-	* cache and use its inode number.  We may even get a connected dentry,
-	* that is not under the first layer's root.  That is also fine for
-	* using it's inode number - it's the same as if we held a reference
-	* to a dentry in first layer that was moved under us.
-	*/
-	mnt = roe->lowerstack[0].mnt;
-
-	origin = ovl_get_origin(upperdentry, mnt);
-	if (IS_ERR_OR_NULL(origin))
-		return PTR_ERR(origin);
+	for (i = 0; i < roe->numlower; i++) {
+		mnt = roe->lowerstack[i].mnt;
+		origin = ovl_get_origin(upperdentry, mnt);
+		if (IS_ERR(origin))
+			return PTR_ERR(origin);
+
+		if (origin)
+			break;
+	}
+
+	if (!origin)
+		return 0;
 
 	BUG_ON(*stackp || *ctrp);
 	*stackp = kmalloc(sizeof(struct path), GFP_TEMPORARY);
@@ -301,6 +297,7 @@ static int ovl_check_origin(struct dentry *dentry, struct dentry *upperdentry,
 		dput(origin);
 		return -ENOMEM;
 	}
+
 	**stackp = (struct path) { .dentry = origin, .mnt = mnt };
 	*ctrp = 1;
 
@@ -372,6 +369,16 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
 		}
 		if (upperdentry && !d.is_dir) {
 			BUG_ON(!d.stop || d.redirect);
+			/*
+			 * Lookup copy up origin by decoding origin file handle.
+			 * We may get a disconnected dentry, which is fine,
+			 * because we only need to hold the origin inode in
+			 * cache and use its inode number.  We may even get a
+			 * connected dentry, that is not under any of the lower
+			 * layers root.  That is also fine for using it's inode
+			 * number - it's the same as if we held a reference
+			 * to a dentry in lower layer that was moved under us.
+			 */
 			err = ovl_check_origin(dentry, upperdentry,
 					       &stack, &ctr);
 			if (err)
-- 
2.7.4

  reply	other threads:[~2017-06-01  9:02 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-01  9:02 [PATCH v3 0/5] ovl: constant inode numbers (cont.) Amir Goldstein
2017-06-01  9:02 ` Amir Goldstein [this message]
2017-06-01  9:02 ` [PATCH v3 2/5] ovl: relax same fs constrain for constant st_ino Amir Goldstein
2017-06-01 12:30   ` Chandan Rajendra
2017-06-01 13:32     ` Amir Goldstein
2017-06-01 19:55   ` Miklos Szeredi
2017-06-02  6:32     ` Amir Goldstein
2017-06-02 12:27       ` Miklos Szeredi
2017-06-02 13:23         ` Amir Goldstein
2017-06-02 13:26           ` Miklos Szeredi
2017-06-02 13:34             ` Amir Goldstein
2017-06-01  9:02 ` [PATCH v3 3/5] vfs: factor out lookup_one_len_init() Amir Goldstein
2017-06-01  9:02 ` [PATCH v3 4/5] vfs: add helper lookup_one_len_noperm() Amir Goldstein
2017-06-05 12:36   ` Amir Goldstein
2017-06-01  9:02 ` [PATCH v3 5/5] ovl: consistent st_ino/d_ino Amir Goldstein
2017-06-20 21:25   ` Miklos Szeredi
2017-06-21  8:03     ` Amir Goldstein
2017-06-21  8:20       ` Miklos Szeredi
2017-06-21  8:38         ` Miklos Szeredi
2017-06-21  8:45           ` Miklos Szeredi
2017-06-21  8:49             ` Amir Goldstein
2017-06-21  8:53               ` Miklos Szeredi
2017-06-21  9:05                 ` Amir Goldstein
2017-06-21  9:20                   ` Miklos Szeredi
2017-06-21  9:36                     ` Amir Goldstein
2017-06-21  9:38                       ` Amir Goldstein
2017-06-21  9:48                       ` Miklos Szeredi
2017-06-23 13:56                         ` Amir Goldstein
2017-06-30 16:23                         ` Chandan Rajendra
2017-06-30 19:01                           ` Amir Goldstein
2017-07-27 20:00                         ` Miklos Szeredi
2017-07-28  9:25                           ` Amir Goldstein
2017-07-29 10:33                             ` Amir Goldstein
2017-07-31 10:58                               ` Miklos Szeredi
2017-08-16 11:16                                 ` Amir Goldstein
2017-07-29 11:26                             ` Chandan Rajendra
2017-08-03  7:18                             ` Chandan Rajendra
2017-08-03  9:53                               ` Chandan Rajendra

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=1496307779-2766-2-git-send-email-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=chandan@linux.vnet.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.