summaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-27 13:41:56 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-28 01:02:50 -0400
commitcf0f0536fa65ca1353476c49feed34891f3f7134 (patch)
treef75e2b40e072821fe4ebfd19ab8b074cdd642cca /fs/jffs2
parent873ae4d5a8b282c6e2bbc09c6d59eeb1bec97ef7 (diff)
downloadblackbird-op-linux-cf0f0536fa65ca1353476c49feed34891f3f7134.tar.gz
blackbird-op-linux-cf0f0536fa65ca1353476c49feed34891f3f7134.zip
jffs2: remove unnecessary dentry_unhash from rmdir, dir rename
jffs2 does not have problems with references to unlinked directories. CC: David Woodhouse <dwmw2@infradead.org> 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/jffs2')
-rw-r--r--fs/jffs2/dir.c5
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)
int ret;
uint32_t now = get_seconds();
- dentry_unhash(dentry);
-
for (fd = f->dents ; fd; fd = fd->next) {
if (fd->ino)
return -ENOTEMPTY;
@@ -786,9 +784,6 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
uint8_t type;
uint32_t now;
- if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
- dentry_unhash(new_dentry);
-
/* The VFS will check for us and prevent trying to rename a
* file over a directory and vice versa, but if it's a directory,
* the VFS can't check whether the victim is empty. The filesystem
OpenPOWER on IntegriCloud