1
0
Fork 0

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
steinar/wifi_calib_4_9_kernel
Linus Torvalds 2016-12-01 10:31:53 -08:00
commit 2caceb3294
1 changed files with 3 additions and 3 deletions

View File

@ -328,11 +328,11 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
if (!real)
goto bug;
/* Handle recursion */
real = d_real(real, inode, open_flags);
if (!inode || inode == d_inode(real))
return real;
/* Handle recursion */
return d_real(real, inode, open_flags);
bug:
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);