diff options
| -rw-r--r-- | fs/ext2/namei.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index 516c31dab97..ed5c5d496ee 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c | |||
| @@ -296,8 +296,6 @@ static int ext2_rmdir (struct inode * dir, struct dentry *dentry) | |||
| 296 | struct inode * inode = dentry->d_inode; | 296 | struct inode * inode = dentry->d_inode; |
| 297 | int err = -ENOTEMPTY; | 297 | int err = -ENOTEMPTY; |
| 298 | 298 | ||
| 299 | dentry_unhash(dentry); | ||
| 300 | |||
| 301 | if (ext2_empty_dir(inode)) { | 299 | if (ext2_empty_dir(inode)) { |
| 302 | err = ext2_unlink(dir, dentry); | 300 | err = ext2_unlink(dir, dentry); |
| 303 | if (!err) { | 301 | if (!err) { |
| @@ -320,9 +318,6 @@ static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry, | |||
| 320 | struct ext2_dir_entry_2 * old_de; | 318 | struct ext2_dir_entry_2 * old_de; |
| 321 | int err = -ENOENT; | 319 | int err = -ENOENT; |
| 322 | 320 | ||
| 323 | if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) | ||
| 324 | dentry_unhash(new_dentry); | ||
| 325 | |||
| 326 | dquot_initialize(old_dir); | 321 | dquot_initialize(old_dir); |
| 327 | dquot_initialize(new_dir); | 322 | dquot_initialize(new_dir); |
| 328 | 323 | ||
