|
@@ -2620,6 +2620,21 @@ static int rdtgroup_rmdir_mon(struct kernfs_node *kn, struct rdtgroup *rdtgrp,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int rdtgroup_ctrl_remove(struct kernfs_node *kn,
|
|
|
+ struct rdtgroup *rdtgrp)
|
|
|
+{
|
|
|
+ rdtgrp->flags = RDT_DELETED;
|
|
|
+ list_del(&rdtgrp->rdtgroup_list);
|
|
|
+
|
|
|
+ /*
|
|
|
+ * one extra hold on this, will drop when we kfree(rdtgrp)
|
|
|
+ * in rdtgroup_kn_unlock()
|
|
|
+ */
|
|
|
+ kernfs_get(kn);
|
|
|
+ kernfs_remove(rdtgrp->kn);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int rdtgroup_rmdir_ctrl(struct kernfs_node *kn, struct rdtgroup *rdtgrp,
|
|
|
cpumask_var_t tmpmask)
|
|
|
{
|
|
@@ -2645,7 +2660,6 @@ static int rdtgroup_rmdir_ctrl(struct kernfs_node *kn, struct rdtgroup *rdtgrp,
|
|
|
cpumask_or(tmpmask, tmpmask, &rdtgrp->cpu_mask);
|
|
|
update_closid_rmid(tmpmask, NULL);
|
|
|
|
|
|
- rdtgrp->flags = RDT_DELETED;
|
|
|
closid_free(rdtgrp->closid);
|
|
|
free_rmid(rdtgrp->mon.rmid);
|
|
|
|
|
@@ -2654,14 +2668,7 @@ static int rdtgroup_rmdir_ctrl(struct kernfs_node *kn, struct rdtgroup *rdtgrp,
|
|
|
*/
|
|
|
free_all_child_rdtgrp(rdtgrp);
|
|
|
|
|
|
- list_del(&rdtgrp->rdtgroup_list);
|
|
|
-
|
|
|
- /*
|
|
|
- * one extra hold on this, will drop when we kfree(rdtgrp)
|
|
|
- * in rdtgroup_kn_unlock()
|
|
|
- */
|
|
|
- kernfs_get(kn);
|
|
|
- kernfs_remove(rdtgrp->kn);
|
|
|
+ rdtgroup_ctrl_remove(kn, rdtgrp);
|
|
|
|
|
|
return 0;
|
|
|
}
|