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 2/5] ovl: relax same fs constrain for constant st_ino
Date: Thu,  1 Jun 2017 12:02:56 +0300	[thread overview]
Message-ID: <1496307779-2766-3-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, use the copy up
origin st_ino/st_dev for non-dir, if we know it.

This guarantied constant and persistent st_ino/st_dev for non-dir,
but not system-wide uniqueness, like in the same fs case.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 fs/overlayfs/inode.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index d613e2c41242..5f285c179bbd 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -65,6 +65,7 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
 	struct path realpath;
 	const struct cred *old_cred;
 	bool is_dir = S_ISDIR(dentry->d_inode->i_mode);
+	bool samefs = ovl_same_sb(dentry->d_sb);
 	int err;
 
 	type = ovl_path_real(dentry, &realpath);
@@ -74,16 +75,16 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
 		goto out;
 
 	/*
-	 * When all layers are on the same fs, all real inode number are
-	 * unique, so we use the overlay st_dev, which is friendly to du -x.
-	 *
-	 * We also use st_ino of the copy up origin, if we know it.
-	 * This guaranties constant st_dev/st_ino across copy up.
+	 * For non-dir or same fs, we use st_ino of the copy up origin, if we
+	 * know it. This guaranties constant st_dev/st_ino across copy up.
 	 *
 	 * If filesystem supports NFS export ops, this also guaranties
 	 * persistent st_ino across mount cycle.
+	 *
+	 * When all layers are on the same fs, all real inode number are
+	 * unique, so we use the overlay st_dev, which is friendly to du -x.
 	 */
-	if (ovl_same_sb(dentry->d_sb)) {
+	if (!is_dir || samefs) {
 		if (OVL_TYPE_ORIGIN(type)) {
 			struct kstat lowerstat;
 			u32 lowermask = STATX_INO | (!is_dir ? STATX_NLINK : 0);
@@ -94,7 +95,6 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
 			if (err)
 				goto out;
 
-			WARN_ON_ONCE(stat->dev != lowerstat.dev);
 			/*
 			 * Lower hardlinks are broken on copy up to different
 			 * upper files, so we cannot use the lower origin st_ino
@@ -102,17 +102,23 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
 			 */
 			if (is_dir || lowerstat.nlink == 1)
 				stat->ino = lowerstat.ino;
+
+			if (samefs)
+				WARN_ON_ONCE(stat->dev != lowerstat.dev);
+			else
+				stat->dev = lowerstat.dev;
 		}
-		stat->dev = dentry->d_sb->s_dev;
-	} else if (is_dir) {
+		if (samefs)
+			stat->dev = dentry->d_sb->s_dev;
+	} else {
 		/*
-		 * If not all layers are on the same fs the pair {real st_ino;
-		 * overlay st_dev} is not unique, so use the non persistent
-		 * overlay st_ino.
-		 *
 		 * Always use the overlay st_dev for directories, so 'find
 		 * -xdev' will scan the entire overlay mount and won't cross the
 		 * overlay mount boundaries.
+		 *
+		 * If not all layers are on the same fs the pair {real st_ino;
+		 * overlay st_dev} is not unique, so use the non persistent
+		 * overlay st_ino for directories.
 		 */
 		stat->dev = dentry->d_sb->s_dev;
 		stat->ino = dentry->d_inode->i_ino;
-- 
2.7.4

  parent 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 ` [PATCH v3 1/5] ovl: relax same fs constrain for ovl_check_origin() Amir Goldstein
2017-06-01  9:02 ` Amir Goldstein [this message]
2017-06-01 12:30   ` [PATCH v3 2/5] ovl: relax same fs constrain for constant st_ino 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-3-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.