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

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

hfs: remove unnecessary dentry_unhash on rmdir, dir rename 



hfs does not have problems with references to unlinked directories.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8aaa0f54

fs/hfs/dir.c

+0 −6
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry) 
	struct inode *inode = dentry->d_inode;

	int res;



	if (S_ISDIR(inode->i_mode))

		dentry_unhash(dentry);



	if (S_ISDIR(inode->i_mode) && inode->i_size != 2)

		return -ENOTEMPTY;

	res = hfs_cat_delete(inode->i_ino, dir, &dentry->d_name);
@@ -286,9 +283,6 @@ static int hfs_rename(struct inode *old_dir, struct dentry *old_dentry, 


	/* Unlink destination if it already exists */

	if (new_dentry->d_inode) {

		if (S_ISDIR(new_dentry->d_inode->i_mode))

			dentry_unhash(new_dentry);



		res = hfs_remove(new_dir, new_dentry);

		if (res)

			return res;