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: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
45adfef7d0
Коммит
f4ff0e25c5
|
@ -326,8 +326,6 @@ static int msdos_rmdir(struct inode *dir, struct dentry *dentry)
|
||||||
struct fat_slot_info sinfo;
|
struct fat_slot_info sinfo;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
dentry_unhash(dentry);
|
|
||||||
|
|
||||||
lock_super(sb);
|
lock_super(sb);
|
||||||
/*
|
/*
|
||||||
* Check whether the directory is not in use, then check
|
* 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;
|
old_inode = old_dentry->d_inode;
|
||||||
new_inode = new_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);
|
err = fat_scan(old_dir, old_name, &old_sinfo);
|
||||||
if (err) {
|
if (err) {
|
||||||
err = -EIO;
|
err = -EIO;
|
||||||
|
|
|
@ -824,8 +824,6 @@ static int vfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||||
struct fat_slot_info sinfo;
|
struct fat_slot_info sinfo;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
dentry_unhash(dentry);
|
|
||||||
|
|
||||||
lock_super(sb);
|
lock_super(sb);
|
||||||
|
|
||||||
err = fat_dir_empty(inode);
|
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;
|
int err, is_dir, update_dotdot, corrupt = 0;
|
||||||
struct super_block *sb = old_dir->i_sb;
|
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_sinfo.bh = sinfo.bh = dotdot_bh = NULL;
|
||||||
old_inode = old_dentry->d_inode;
|
old_inode = old_dentry->d_inode;
|
||||||
new_inode = new_dentry->d_inode;
|
new_inode = new_dentry->d_inode;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче