Skip to content

Commit

Permalink
fat: remove unnecessary dentry_unhash on rmdir, dir rename
Browse files Browse the repository at this point in the history
fat does not have problems with references to unlinked directories.

CC: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Sage Weil authored and Al Viro committed May 28, 2011
1 parent 45adfef commit f4ff0e2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
5 changes: 0 additions & 5 deletions fs/fat/namei_msdos.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions fs/fat/namei_vfat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f4ff0e2

Please sign in to comment.