Skip to content

Commit 2caceb3

Browse files
committed
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
2 parents 92cf44e + c4fcfc1 commit 2caceb3

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

fs/overlayfs/super.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
328328
if (!real)
329329
goto bug;
330330

331+
/* Handle recursion */
332+
real = d_real(real, inode, open_flags);
333+
331334
if (!inode || inode == d_inode(real))
332335
return real;
333-
334-
/* Handle recursion */
335-
return d_real(real, inode, open_flags);
336336
bug:
337337
WARN(1, "ovl_d_real(%pd4, %s:%lu): real dentry not found\n", dentry,
338338
inode ? inode->i_sb->s_id : "NULL", inode ? inode->i_ino : 0);

0 commit comments

Comments
 (0)