configfs_register_group() shouldn't be (and isn't) called in rmdirable parts

revert cc57c07343 "configfs: fix registered group removal"
It was an attempt to handle something that fundamentally doesn't
work - configfs_register_group() should never be done in a part
of tree that can be rmdir'ed.  And in mainline it never had been,
so let's not borrow trouble; the fix was racy anyway, it would take
a lot more to make that work and desired semantics is not clear.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Al Viro 2019-08-29 23:13:30 -04:00 committed by Christoph Hellwig
parent ff4dd08197
commit f19e4ed1e1

View File

@ -1771,16 +1771,6 @@ void configfs_unregister_group(struct config_group *group)
struct dentry *dentry = group->cg_item.ci_dentry; struct dentry *dentry = group->cg_item.ci_dentry;
struct dentry *parent = group->cg_item.ci_parent->ci_dentry; struct dentry *parent = group->cg_item.ci_parent->ci_dentry;
mutex_lock(&subsys->su_mutex);
if (!group->cg_item.ci_parent->ci_group) {
/*
* The parent has already been unlinked and detached
* due to a rmdir.
*/
goto unlink_group;
}
mutex_unlock(&subsys->su_mutex);
inode_lock_nested(d_inode(parent), I_MUTEX_PARENT); inode_lock_nested(d_inode(parent), I_MUTEX_PARENT);
spin_lock(&configfs_dirent_lock); spin_lock(&configfs_dirent_lock);
configfs_detach_prep(dentry, NULL); configfs_detach_prep(dentry, NULL);
@ -1796,7 +1786,6 @@ void configfs_unregister_group(struct config_group *group)
dput(dentry); dput(dentry);
mutex_lock(&subsys->su_mutex); mutex_lock(&subsys->su_mutex);
unlink_group:
unlink_group(group); unlink_group(group);
mutex_unlock(&subsys->su_mutex); mutex_unlock(&subsys->su_mutex);
} }