aboutsummaryrefslogtreecommitdiffstats
path: root/fs/afs/dir.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-27 16:42:13 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-28 01:02:53 -0400
commit705da2de95ce79199a52f21d82dd9f36b89afd12 (patch)
treec5c2ee71bf417726fa4c765028e72b057aa6a3e1 /fs/afs/dir.c
parent94f9901b6c05d5e1e38d887179b8307efbc8e10c (diff)
afs: remove unnecessary dentry_unhash on rmdir, dir rename
afs has no problems with references to unlinked directories. CC: David Howells <dhowells@redhat.com> CC: linux-afs@lists.infradead.org Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/afs/dir.c')
-rw-r--r--fs/afs/dir.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 2c4e05160042..20c106f24927 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -845,8 +845,6 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry)
845 _enter("{%x:%u},{%s}", 845 _enter("{%x:%u},{%s}",
846 dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name); 846 dvnode->fid.vid, dvnode->fid.vnode, dentry->d_name.name);
847 847
848 dentry_unhash(dentry);
849
850 ret = -ENAMETOOLONG; 848 ret = -ENAMETOOLONG;
851 if (dentry->d_name.len >= AFSNAMEMAX) 849 if (dentry->d_name.len >= AFSNAMEMAX)
852 goto error; 850 goto error;
@@ -1148,9 +1146,6 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,
1148 struct key *key; 1146 struct key *key;
1149 int ret; 1147 int ret;
1150 1148
1151 if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
1152 dentry_unhash(new_dentry);
1153
1154 vnode = AFS_FS_I(old_dentry->d_inode); 1149 vnode = AFS_FS_I(old_dentry->d_inode);
1155 orig_dvnode = AFS_FS_I(old_dir); 1150 orig_dvnode = AFS_FS_I(old_dir);
1156 new_dvnode = AFS_FS_I(new_dir); 1151 new_dvnode = AFS_FS_I(new_dir);