From 85a3bfa081111a1d27e2429d145f197dbce2a011 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 27 May 2011 13:42:00 -0700 Subject: [PATCH] --- yaml --- r: 252711 b: refs/heads/master c: 0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06 h: refs/heads/master i: 252709: d01247a4988ffaad0bdc95908ab289013faa21f4 252707: a237a397e7fed1902507273fb1e3b605f6fa3dd1 252703: e73eab9a2fc183768335b59c459845a318b20fcd v: v3 --- [refs] | 2 +- trunk/fs/ubifs/dir.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 591b71a11444..cd49b2834579 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfb55de89879a1c32a70d0a510b3701ed9a6b855 +refs/heads/master: 0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06 diff --git a/trunk/fs/ubifs/dir.c b/trunk/fs/ubifs/dir.c index c2b80943560d..ef5abd38f0bf 100644 --- a/trunk/fs/ubifs/dir.c +++ b/trunk/fs/ubifs/dir.c @@ -656,8 +656,6 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry) struct ubifs_inode *dir_ui = ubifs_inode(dir); struct ubifs_budget_req req = { .mod_dent = 1, .dirtied_ino = 2 }; - dentry_unhash(dentry); - /* * Budget request settings: deletion direntry, deletion inode and * changing the parent inode. If budgeting fails, go ahead anyway @@ -978,9 +976,6 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) }; struct timespec time; - if (new_inode && S_ISDIR(new_inode->i_mode)) - dentry_unhash(new_dentry); - /* * Budget request settings: deletion direntry, new direntry, removing * the old inode, and changing old and new parent directory inodes.