diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-27 16:42:16 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-05-28 01:02:54 -0400 |
| commit | b80d2c228d8206cadc32226750dbbf3b707bdd19 (patch) | |
| tree | ca106ba5a3cec0bb854a8a8deba5e6da80c6095d | |
| parent | 526e7ce5528c8addcf154acec41b615f71dce7e1 (diff) | |
minix: remove unnecessary dentry_unhash on rmdir, dir rename
Minix has no issues with references to unlinked directories.
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/minix/namei.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/minix/namei.c b/fs/minix/namei.c index f60aed8db9c4..6e6777f1b4b2 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c | |||
| @@ -168,8 +168,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry) | |||
| 168 | struct inode * inode = dentry->d_inode; | 168 | struct inode * inode = dentry->d_inode; |
| 169 | int err = -ENOTEMPTY; | 169 | int err = -ENOTEMPTY; |
| 170 | 170 | ||
| 171 | dentry_unhash(dentry); | ||
| 172 | |||
| 173 | if (minix_empty_dir(inode)) { | 171 | if (minix_empty_dir(inode)) { |
| 174 | err = minix_unlink(dir, dentry); | 172 | err = minix_unlink(dir, dentry); |
| 175 | if (!err) { | 173 | if (!err) { |
| @@ -192,9 +190,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, | |||
| 192 | struct minix_dir_entry * old_de; | 190 | struct minix_dir_entry * old_de; |
| 193 | int err = -ENOENT; | 191 | int err = -ENOENT; |
| 194 | 192 | ||
| 195 | if (new_inode && S_ISDIR(new_inode->i_mode)) | ||
| 196 | dentry_unhash(new_dentry); | ||
| 197 | |||
| 198 | old_de = minix_find_entry(old_dentry, &old_page); | 193 | old_de = minix_find_entry(old_dentry, &old_page); |
| 199 | if (!old_de) | 194 | if (!old_de) |
| 200 | goto out; | 195 | goto out; |
