1 files changed, 5 insertions, 6 deletions

diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index 0f85ee9c3268..698b74dd750e 100644
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -1021,13 +1021,12 @@ int ovl_indexdir_cleanup(struct dentry *dentry, struct vfsmount *mnt,
                         break;
                 }
                 err = ovl_verify_index(index, lowerstack, numlower);
-                if (err) {
-                        if (err == -EROFS)
-                                break;
+                /* Cleanup stale and orphan index entries */
+                if (err && (err == -ESTALE || err == -ENOENT))
                         err = ovl_cleanup(dir, index);
-                        if (err)
-                                break;
-                }
+                if (err)
+                        break;
+
                 dput(index);
                 index = NULL;
         }