diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/jffs2/dir.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 05f73328b28b..82faddd1f321 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
@@ -609,8 +609,6 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry) | |||
609 | int ret; | 609 | int ret; |
610 | uint32_t now = get_seconds(); | 610 | uint32_t now = get_seconds(); |
611 | 611 | ||
612 | dentry_unhash(dentry); | ||
613 | |||
614 | for (fd = f->dents ; fd; fd = fd->next) { | 612 | for (fd = f->dents ; fd; fd = fd->next) { |
615 | if (fd->ino) | 613 | if (fd->ino) |
616 | return -ENOTEMPTY; | 614 | return -ENOTEMPTY; |
@@ -786,9 +784,6 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, | |||
786 | uint8_t type; | 784 | uint8_t type; |
787 | uint32_t now; | 785 | uint32_t now; |
788 | 786 | ||
789 | if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) | ||
790 | dentry_unhash(new_dentry); | ||
791 | |||
792 | /* The VFS will check for us and prevent trying to rename a | 787 | /* The VFS will check for us and prevent trying to rename a |
793 | * file over a directory and vice versa, but if it's a directory, | 788 | * file over a directory and vice versa, but if it's a directory, |
794 | * the VFS can't check whether the victim is empty. The filesystem | 789 | * the VFS can't check whether the victim is empty. The filesystem |