2 files changed, 3 insertions, 2 deletions

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 82c129bfe58d..93872bb50230 100644
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -260,7 +260,7 @@ static int ovl_instantiate(struct dentry *dentry, struct inode *inode,
                  * hashed directory inode aliases.
                  */
                 inode = ovl_get_inode(dentry->d_sb, &oip);
-                if (WARN_ON(IS_ERR(inode)))
+                if (IS_ERR(inode))
                         return PTR_ERR(inode);
         } else {
                 WARN_ON(ovl_inode_real(inode) != d_inode(newdentry));
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 3b7ed5d2279c..b48273e846ad 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -832,7 +832,7 @@ struct inode *ovl_get_inode(struct super_block *sb,
         int fsid = bylower ? oip->lowerpath->layer->fsid : 0;
         bool is_dir, metacopy = false;
         unsigned long ino = 0;
-        int err = -ENOMEM;
+        int err = oip->newinode ? -EEXIST : -ENOMEM;
 
         if (!realinode)
                 realinode = d_inode(lowerdentry);
@@ -917,6 +917,7 @@ out:
         return inode;
 
 out_err:
+        pr_warn_ratelimited("overlayfs: failed to get inode (%i)\n", err);
         inode = ERR_PTR(err);
         goto out;
 }