aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs/dir.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-27 16:42:00 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-28 01:02:51 -0400
commit0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06 (patch)
tree6504d32b3d3e1a3dadc7d7083b5614702f479808 /fs/ubifs/dir.c
parentdfb55de89879a1c32a70d0a510b3701ed9a6b855 (diff)
ubifs: remove unnecessary dentry_unhash from rmdir, dir rename
ubifs does not have problems with references to unlinked directories. CC: Artem Bityutskiy <dedekind1@gmail.com> CC: Adrian Hunter <adrian.hunter@nokia.com> CC: linux-mtd@lists.infradead.org Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ubifs/dir.c')
-rw-r--r--fs/ubifs/dir.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index c2b80943560d..ef5abd38f0bf 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -656,8 +656,6 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
656 struct ubifs_inode *dir_ui = ubifs_inode(dir); 656 struct ubifs_inode *dir_ui = ubifs_inode(dir);
657 struct ubifs_budget_req req = { .mod_dent = 1, .dirtied_ino = 2 }; 657 struct ubifs_budget_req req = { .mod_dent = 1, .dirtied_ino = 2 };
658 658
659 dentry_unhash(dentry);
660
661 /* 659 /*
662 * Budget request settings: deletion direntry, deletion inode and 660 * Budget request settings: deletion direntry, deletion inode and
663 * changing the parent inode. If budgeting fails, go ahead anyway 661 * 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,
978 .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) }; 976 .dirtied_ino_d = ALIGN(old_inode_ui->data_len, 8) };
979 struct timespec time; 977 struct timespec time;
980 978
981 if (new_inode && S_ISDIR(new_inode->i_mode))
982 dentry_unhash(new_dentry);
983
984 /* 979 /*
985 * Budget request settings: deletion direntry, new direntry, removing 980 * Budget request settings: deletion direntry, new direntry, removing
986 * the old inode, and changing old and new parent directory inodes. 981 * the old inode, and changing old and new parent directory inodes.