Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / overlayfs / inode.c

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 3b7ed5d2279c6a8efde8180471bde94ef1020964..b48273e846adc524eeaa50bde608a93b8bdeb102 100644 (file)
--- 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 @@ struct inode *ovl_get_inode(struct super_block *sb,
        return inode;
 
 out_err:
+       pr_warn_ratelimited("overlayfs: failed to get inode (%i)\n", err);
        inode = ERR_PTR(err);
        goto out;
 }