ovl: fix getcwd() failure after unsuccessful rmdir

[karo-tx-linux.git] / fs / overlayfs / dir.c

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index ed95272d57a61af3f26a58c71cf789d3c94e28ce..795ab65ccdf5e0cd84ab7a3c78219dec39499de5 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -618,7 +618,8 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
         * sole user of this dentry.  Too tricky...  Just unhash for
         * now.
         */
-       d_drop(dentry);
+       if (!err)
+               d_drop(dentry);
        inode_unlock(dir);
 
        return err;