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>
This commit is contained in:
@@ -168,8 +168,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry)
|
|||||||
struct inode * inode = dentry->d_inode;
|
struct inode * inode = dentry->d_inode;
|
||||||
int err = -ENOTEMPTY;
|
int err = -ENOTEMPTY;
|
||||||
|
|
||||||
dentry_unhash(dentry);
|
|
||||||
|
|
||||||
if (minix_empty_dir(inode)) {
|
if (minix_empty_dir(inode)) {
|
||||||
err = minix_unlink(dir, dentry);
|
err = minix_unlink(dir, dentry);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
@@ -192,9 +190,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
|
|||||||
struct minix_dir_entry * old_de;
|
struct minix_dir_entry * old_de;
|
||||||
int err = -ENOENT;
|
int err = -ENOENT;
|
||||||
|
|
||||||
if (new_inode && S_ISDIR(new_inode->i_mode))
|
|
||||||
dentry_unhash(new_dentry);
|
|
||||||
|
|
||||||
old_de = minix_find_entry(old_dentry, &old_page);
|
old_de = minix_find_entry(old_dentry, &old_page);
|
||||||
if (!old_de)
|
if (!old_de)
|
||||||
goto out;
|
goto out;
|
||||||
|
Reference in New Issue
Block a user