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 14/18] ovl: Do not mark a non dir as _OVL_PATH_MERGE in ovl_path_type()
Date: Wed, 31 Jan 2018 16:13:25 -0500 [thread overview]
Message-ID: <20180131211329.16328-15-vgoyal@redhat.com> (raw)
In-Reply-To: <20180131211329.16328-1-vgoyal@redhat.com>
With the addition of an origin chain for regular files, it is possible
that we don't have an upperdentry and oe->numlower > 1 for non-dir. So
mark a path __OVL_TYPE_MERGE only if it is a directory.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
fs/overlayfs/util.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 3b509b691032..e717d561019d 100644
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -106,7 +106,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
type |= __OVL_PATH_MERGE;
}
} else {
- if (oe->numlower > 1)
+ if (oe->numlower > 1 && d_is_dir(dentry))
type |= __OVL_PATH_MERGE;
}
return type;
--
2.13.6
next prev 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 ` [PATCH v11 12/18] ovl: Get and install lower most data dentry in stack Vivek Goyal
2018-02-01 0:05 ` 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 ` Vivek Goyal [this message]
2018-01-31 23:51 ` [PATCH v11 14/18] ovl: Do not mark a non dir as _OVL_PATH_MERGE in ovl_path_type() 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-15-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