aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-27 16:42:02 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-28 01:02:51 -0400
commitcc350c2764a657ee012efd5bd260a6cd5be2f877 (patch)
tree1360aeab2ec2fbb71e80804df2f11f57b6bfb025 /fs/reiserfs
parent87161faae26503a8ebe1be5ba72073ae860dbfc7 (diff)
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>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/namei.c5
-rw-r--r--fs/reiserfs/xattr.c1
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 76c8164d5651..118662690cdf 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -831,8 +831,6 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
831 INITIALIZE_PATH(path); 831 INITIALIZE_PATH(path);
832 struct reiserfs_dir_entry de; 832 struct reiserfs_dir_entry de;
833 833
834 dentry_unhash(dentry);
835
836 /* we will be doing 2 balancings and update 2 stat data, we change quotas 834 /* we will be doing 2 balancings and update 2 stat data, we change quotas
837 * of the owner of the directory and of the owner of the parent directory. 835 * of the owner of the directory and of the owner of the parent directory.
838 * The quota structure is possibly deleted only on last iput => outside 836 * 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,
1227 unsigned long savelink = 1; 1225 unsigned long savelink = 1;
1228 struct timespec ctime; 1226 struct timespec ctime;
1229 1227
1230 if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
1231 dentry_unhash(new_dentry);
1232
1233 /* three balancings: (1) old name removal, (2) new name insertion 1228 /* three balancings: (1) old name removal, (2) new name insertion
1234 and (3) maybe "save" link insertion 1229 and (3) maybe "save" link insertion
1235 stat data updates: (1) old directory, 1230 stat data updates: (1) old directory,
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 50f1abccd1cd..e8a62f41b458 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -98,7 +98,6 @@ static int xattr_rmdir(struct inode *dir, struct dentry *dentry)
98 98
99 reiserfs_mutex_lock_nested_safe(&dentry->d_inode->i_mutex, 99 reiserfs_mutex_lock_nested_safe(&dentry->d_inode->i_mutex,
100 I_MUTEX_CHILD, dir->i_sb); 100 I_MUTEX_CHILD, dir->i_sb);
101 dentry_unhash(dentry);
102 error = dir->i_op->rmdir(dir, dentry); 101 error = dir->i_op->rmdir(dir, dentry);
103 if (!error) 102 if (!error)
104 dentry->d_inode->i_flags |= S_DEAD; 103 dentry->d_inode->i_flags |= S_DEAD;