From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amir Goldstein Subject: [PATCH v5 3/4] ovl: relax same fs constrain for constant st_ino Date: Mon, 30 Oct 2017 22:27:26 +0200 Message-ID: <1509395247-15180-4-git-send-email-amir73il@gmail.com> References: <1509395247-15180-1-git-send-email-amir73il@gmail.com> Return-path: Received: from mail-wr0-f193.google.com ([209.85.128.193]:54114 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751905AbdJ3U0v (ORCPT ); Mon, 30 Oct 2017 16:26:51 -0400 Received: by mail-wr0-f193.google.com with SMTP id u40so13880415wrf.10 for ; Mon, 30 Oct 2017 13:26:50 -0700 (PDT) In-Reply-To: <1509395247-15180-1-git-send-email-amir73il@gmail.com> Sender: linux-unionfs-owner@vger.kernel.org List-Id: linux-unionfs@vger.kernel.org To: Miklos Szeredi Cc: Chandan Rajendra , zhangyi , linux-unionfs@vger.kernel.org For the case of all layers not on the same fs, use the copy up origin st_ino for non-dir, if we know it. This guaranties constant and system-wide unique st_ino/st_dev for non-dir across copy up. Like the same fs case, st_ino of non-dir is also persistent. Unlike the same fs case, st_dev is not persistent. Signed-off-by: Amir Goldstein --- fs/overlayfs/inode.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index ec5c3ce91868..a65746e000a3 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -82,6 +82,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); @@ -91,16 +92,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); @@ -111,7 +112,6 @@ int ovl_getattr(const struct path *path, struct kstat *stat, if (err) goto out; - WARN_ON_ONCE(stat->dev != lowerstat.dev); /* * Lower hardlinks may be broken on copy up to different * upper files, so we cannot use the lower origin st_ino @@ -123,22 +123,28 @@ int ovl_getattr(const struct path *path, struct kstat *stat, if (is_dir || lowerstat.nlink == 1 || ovl_test_flag(OVL_INDEX, d_inode(dentry))) 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 + stat->dev = ovl_get_pseudo_dev(dentry, stat->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; - } else { - stat->dev = ovl_get_pseudo_dev(dentry, stat->dev); } /* -- 2.7.4