ovl: Do not set dentry type ORIGIN for broken hardlinks

If a dentry has copy up origin, we set flag OVL_PATH_ORIGIN.  So far this
decision was easy that we had to check only for oe->numlower and if it is
non-zero, we knew there is copy up origin.  (For non-dir we installed
origin dentry in lowerstack[0]).

But we don't create ORGIN xattr for broken hardlinks (index=off).  And with
metacopy feature it is possible that we will install lowerstack[0] but
ORIGIN xattr is not there.  It is data dentry of upper metacopy dentry
which has been found using regular name based lookup or using REDIRECT.  So
with addition of this new case, just presence of oe->numlower is not
sufficient to guarantee that ORIGIN xattr is present.

So to differentiate between two cases, look at OVL_CONST_INO flag.  If this
flag is set and upperdentry is there, that means it can be marked as type
ORIGIN.  OVL_CONST_INO is not set if lower hardlink is broken or will be
broken over copy up.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 61ace2de3019f168164007746ede45547800d681..1aa9e0c5a3270806af729ef8ac1e4359cbbe3196 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -133,7 +133,8 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
                 * Non-dir dentry can hold lower dentry of its copy up origin.
                 */
                if (oe->numlower) {
-                       type |= __OVL_PATH_ORIGIN;
+                       if (ovl_test_flag(OVL_CONST_INO, d_inode(dentry)))
+                               type |= __OVL_PATH_ORIGIN;
                        if (d_is_dir(dentry) ||
                            !ovl_has_upperdata(d_inode(dentry)))
                                type |= __OVL_PATH_MERGE;