Commit 2caceb32 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs fix from Miklos Szeredi:
 "This fixes a regression introduced in 4.8"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fix d_real() for stacked fs
parents 92cf44e2 c4fcfc16
...@@ -328,11 +328,11 @@ static struct dentry *ovl_d_real(struct dentry *dentry, ...@@ -328,11 +328,11 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
if (!real) if (!real)
goto bug; goto bug;
/* Handle recursion */
real = d_real(real, inode, open_flags);
if (!inode || inode == d_inode(real)) if (!inode || inode == d_inode(real))
return real; return real;
/* Handle recursion */
return d_real(real, inode, open_flags);
bug: bug:
WARN(1, "ovl_d_real(%pd4, %s:%lu): real dentry not found\n", dentry, WARN(1, "ovl_d_real(%pd4, %s:%lu): real dentry not found\n", dentry,
inode ? inode->i_sb->s_id : "NULL", inode ? inode->i_ino : 0); inode ? inode->i_sb->s_id : "NULL", inode ? inode->i_ino : 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment