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

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

omfs: remove unnecessary dentry_unhash on rmdir, dir rneame 



omfs does not have problems with references to unlinked directories.

CC: Bob Copeland <me@bobcopeland.com>
CC: linux-karma-devel@lists.sourceforge.net
Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7020739d

fs/omfs/dir.c

+3 −8
Original line number Diff line number Diff line
@@ -241,11 +241,9 @@ static int omfs_remove(struct inode *dir, struct dentry *dentry) 
	int ret;





	if (S_ISDIR(inode->i_mode)) {

		dentry_unhash(dentry);

		if (!omfs_dir_is_empty(inode))

	if (S_ISDIR(inode->i_mode) &&

	    !omfs_dir_is_empty(inode))

		return -ENOTEMPTY;

	}



	ret = omfs_delete_entry(dentry);

	if (ret)
@@ -382,9 +380,6 @@ static int omfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	int err;



	if (new_inode) {

		if (S_ISDIR(new_inode->i_mode))

			dentry_unhash(new_dentry);



		/* overwriting existing file/dir */

		err = omfs_remove(new_dir, new_dentry);

		if (err)