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

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

fat: remove unnecessary dentry_unhash on rmdir, dir rename 



fat does not have problems with references to unlinked directories.

CC: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 45adfef7

fs/fat/namei_msdos.c

+0 −5
Original line number Diff line number Diff line
@@ -326,8 +326,6 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry) 
	struct fat_slot_info sinfo;

	int err;



	dentry_unhash(dentry);



	lock_super(sb);

	/*

	 * Check whether the directory is not in use, then check
@@ -459,9 +457,6 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name, 
	old_inode = old_dentry->d_inode;

	new_inode = new_dentry->d_inode;



	if (new_inode && S_ISDIR(new_inode->i_mode))

		dentry_unhash(new_dentry);



	err = fat_scan(old_dir, old_name, &old_sinfo);

	if (err) {

		err = -EIO;

fs/fat/namei_vfat.c

+0 −5
Original line number Diff line number Diff line
@@ -824,8 +824,6 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry) 
	struct fat_slot_info sinfo;

	int err;



	dentry_unhash(dentry);



	lock_super(sb);



	err = fat_dir_empty(inode);
@@ -933,9 +931,6 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry, 
	int err, is_dir, update_dotdot, corrupt = 0;

	struct super_block *sb = old_dir->i_sb;



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

		dentry_unhash(new_dentry);



	old_sinfo.bh = sinfo.bh = dotdot_bh = NULL;

	old_inode = old_dentry->d_inode;

	new_inode = new_dentry->d_inode;