aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-27 16:42:17 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-05-28 01:02:54 -0400
commit45adfef7d023004ff95bf63b5f2f0e2d88afac3f (patch)
treee01898bc3e7a82340723d299cf881903283d7e7a
parentb80d2c228d8206cadc32226750dbbf3b707bdd19 (diff)
hpfs: remove unnecessary dentry_unhash on rmdir, dir rename
Hpfs has no problems with references to unlinked directories. We leave one dentry_unhash call in place, in hpfs_unlink's strange path where it tries to truncate a file because the disk is full. I'm not sure what the full story is there. CC: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz> Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/hpfs/namei.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c
index ff0ce21c0867..acf95dab2aac 100644
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@ -439,8 +439,6 @@ static int hpfs_rmdir(struct inode *dir, struct dentry *dentry)
439 int err; 439 int err;
440 int r; 440 int r;
441 441
442 dentry_unhash(dentry);
443
444 hpfs_adjust_length(name, &len); 442 hpfs_adjust_length(name, &len);
445 hpfs_lock(dir->i_sb); 443 hpfs_lock(dir->i_sb);
446 err = -ENOENT; 444 err = -ENOENT;
@@ -535,9 +533,6 @@ static int hpfs_rename(struct inode *old_dir, struct dentry *old_dentry,
535 struct fnode *fnode; 533 struct fnode *fnode;
536 int err; 534 int err;
537 535
538 if (new_inode && S_ISDIR(new_inode->i_mode))
539 dentry_unhash(new_dentry);
540
541 if ((err = hpfs_chk_name(new_name, &new_len))) return err; 536 if ((err = hpfs_chk_name(new_name, &new_len))) return err;
542 err = 0; 537 err = 0;
543 hpfs_adjust_length(old_name, &old_len); 538 hpfs_adjust_length(old_name, &old_len);