Patchwork [03/26] jffs2: remove unnecessary dentry_unhash from rmdir, dir rename

login
register
mail settings
Submitter Sage Weil
Date May 27, 2011, 8:41 p.m.
Message ID <1306528939-30636-4-git-send-email-sage@newdream.net>
Download mbox | patch
Permalink /patch/97750/
State New
Headers show

Comments

Sage Weil - May 27, 2011, 8:41 p.m.
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>
---
 fs/jffs2/dir.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

Patch

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 05f7332..82faddd 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