Ver Fonte

reiserfs: remove unnecessary dentry_unhash from rmdir, dir rename

Reiserfs does not have problems with references to unlinked directories.

CC: reiserfs-devel@vger.kernel.org
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Sage Weil há 14 anos atrás
pai
commit
cc350c2764
2 ficheiros alterados com 0 adições e 6 exclusões
  1. 0 5
      fs/reiserfs/namei.c
  2. 0 1
      fs/reiserfs/xattr.c

+ 0 - 5
fs/reiserfs/namei.c

@@ -831,8 +831,6 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
 	INITIALIZE_PATH(path);
 	INITIALIZE_PATH(path);
 	struct reiserfs_dir_entry de;
 	struct reiserfs_dir_entry de;
 
 
-	dentry_unhash(dentry);
-
 	/* we will be doing 2 balancings and update 2 stat data, we change quotas
 	/* we will be doing 2 balancings and update 2 stat data, we change quotas
 	 * of the owner of the directory and of the owner of the parent directory.
 	 * of the owner of the directory and of the owner of the parent directory.
 	 * The quota structure is possibly deleted only on last iput => outside
 	 * The quota structure is possibly deleted only on last iput => outside
@@ -1227,9 +1225,6 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	unsigned long savelink = 1;
 	unsigned long savelink = 1;
 	struct timespec ctime;
 	struct timespec ctime;
 
 
-	if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
-		dentry_unhash(new_dentry);
-
 	/* three balancings: (1) old name removal, (2) new name insertion
 	/* three balancings: (1) old name removal, (2) new name insertion
 	   and (3) maybe "save" link insertion
 	   and (3) maybe "save" link insertion
 	   stat data updates: (1) old directory,
 	   stat data updates: (1) old directory,

+ 0 - 1
fs/reiserfs/xattr.c

@@ -98,7 +98,6 @@ static int xattr_rmdir(struct inode *dir, struct dentry *dentry)
 
 
 	reiserfs_mutex_lock_nested_safe(&dentry->d_inode->i_mutex,
 	reiserfs_mutex_lock_nested_safe(&dentry->d_inode->i_mutex,
 					I_MUTEX_CHILD, dir->i_sb);
 					I_MUTEX_CHILD, dir->i_sb);
-	dentry_unhash(dentry);
 	error = dir->i_op->rmdir(dir, dentry);
 	error = dir->i_op->rmdir(dir, dentry);
 	if (!error)
 	if (!error)
 		dentry->d_inode->i_flags |= S_DEAD;
 		dentry->d_inode->i_flags |= S_DEAD;