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

[firefly-linux-kernel-4.4.55.git] / fs / omfs / dir.c

diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c
index de4ff29f1e0595c549877d16144064dae9bcbb7a..c368360c35a167be19592642f803dd4211f20b49 100644 (file)
--- a/fs/omfs/dir.c
+++ b/fs/omfs/dir.c
@@ -240,8 +240,12 @@ static int omfs_remove(struct inode *dir, struct dentry *dentry)
        struct inode *inode = dentry->d_inode;
        int ret;
 
-       if (S_ISDIR(inode->i_mode) && !omfs_dir_is_empty(inode))
-               return -ENOTEMPTY;
+
+       if (S_ISDIR(inode->i_mode)) {
+               dentry_unhash(dentry);
+               if (!omfs_dir_is_empty(inode))
+                       return -ENOTEMPTY;
+       }
 
        ret = omfs_delete_entry(dentry);
        if (ret)
@@ -378,6 +382,9 @@ static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        int err;
 
        if (new_inode) {
+               if (S_ISDIR(new_inode->i_mode))
+                       dentry_unhash(new_dentry);
+
                /* overwriting existing file/dir */
                err = omfs_remove(new_dir, new_dentry);
                if (err)