summaryrefslogtreecommitdiffstats
path: root/fs/overlayfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/overlayfs')
-rw-r--r--fs/overlayfs/super.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 6d22bbd5f27f..2e0fc93c2c06 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -95,10 +95,13 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
}
real = ovl_dentry_upper(dentry);
- if (real && (!inode || inode == d_inode(real)))
+ if (real && (inode == d_inode(real)))
return real;
- real = ovl_dentry_lower(dentry);
+ if (real && !inode && ovl_has_upperdata(d_inode(dentry)))
+ return real;
+
+ real = ovl_dentry_lowerdata(dentry);
if (!real)
goto bug;