diff --git a/[refs] b/[refs] index 168dd93b9bef..1e88786706e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4ff0e25c5093dd89e9cac4a8f71a57587ada787 +refs/heads/master: 98702467f829177b3993f17da9fe5c202d160e5e diff --git a/trunk/fs/configfs/dir.c b/trunk/fs/configfs/dir.c index 9d17d350abc5..9a37a9b6de3a 100644 --- a/trunk/fs/configfs/dir.c +++ b/trunk/fs/configfs/dir.c @@ -1359,8 +1359,6 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) struct module *subsys_owner = NULL, *dead_item_owner = NULL; int ret; - dentry_unhash(dentry); - if (dentry->d_parent == configfs_sb->s_root) return -EPERM;