diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-27 13:42:00 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-28 01:02:51 -0400 |
| commit | 0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06 (patch) | |
| tree | 6504d32b3d3e1a3dadc7d7083b5614702f479808 | |
| parent | dfb55de89879a1c32a70d0a510b3701ed9a6b855 (diff) | |
| download | linux-3.10-0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06.tar.gz linux-3.10-0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06.tar.bz2 linux-3.10-0e54ec1c3a002a9d5e57b5ac73a934cc15a0fe06.zip | |
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>
| -rw-r--r-- | fs/ubifs/dir.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index c2b80943560..ef5abd38f0b 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) 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. |