Skip to content

Commit

Permalink
ovl: set lower layer st_dev only if setting lower st_ino
Browse files Browse the repository at this point in the history
For broken hardlinks, we do not return lower st_ino, so we should
also not return lower pseudo st_dev.

Fixes: a0c5ad3 ("ovl: relax same fs constraint for constant st_ino")
Cc: <stable@vger.kernel.org> #v4.15
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
amir73il authored and Miklos Szeredi committed Apr 12, 2018
1 parent 3ec9b3f commit 9f99e50
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions fs/overlayfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,10 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
*/
if (ovl_test_flag(OVL_INDEX, d_inode(dentry)) ||
(!ovl_verify_lower(dentry->d_sb) &&
(is_dir || lowerstat.nlink == 1)))
(is_dir || lowerstat.nlink == 1))) {
stat->ino = lowerstat.ino;

if (samefs)
WARN_ON_ONCE(stat->dev != lowerstat.dev);
else
stat->dev = ovl_get_pseudo_dev(dentry);
}
}
if (samefs) {
/*
Expand Down

0 comments on commit 9f99e50

Please sign in to comment.