Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf0f0536 authored by Sage Weil's avatar Sage Weil Committed by Al Viro
Browse files

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: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 873ae4d5

fs/jffs2/dir.c

+0 −5
Original line number Diff line number Diff line
@@ -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