Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e4f7bc8 authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: nodemgr: remove a kcalloc



Was I sleepwalking when I wrote this?

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 3015c739
Loading
Loading
Loading
Loading
+20 −46
Original line number Diff line number Diff line
@@ -754,59 +754,33 @@ static DEFINE_MUTEX(nodemgr_serialize_remove_uds);
static void nodemgr_remove_uds(struct node_entry *ne)
{
	struct class_device *cdev;
	struct unit_directory *ud, **unreg;
	size_t i, count;
	struct unit_directory *tmp, *ud;

	/*
	 * This is awkward:
	 * Iteration over nodemgr_ud_class.children has to be protected by
	/* Iteration over nodemgr_ud_class.children has to be protected by
	 * nodemgr_ud_class.sem, but class_device_unregister() will eventually
	 * take nodemgr_ud_class.sem too. Therefore store all uds to be
	 * unregistered in a temporary array, release the semaphore, and then
	 * unregister the uds.
	 *
	 * Since nodemgr_remove_uds can also run in other contexts than the
	 * knodemgrds (which are currently globally serialized), protect the
	 * take nodemgr_ud_class.sem too. Therefore pick out one ud at a time,
	 * release the semaphore, and then unregister the ud. Since this code
	 * may be called from other contexts besides the knodemgrds, protect the
	 * gap after release of the semaphore by nodemgr_serialize_remove_uds.
	 */

	mutex_lock(&nodemgr_serialize_remove_uds);

	for (;;) {
		ud = NULL;
		down(&nodemgr_ud_class.sem);
	count = 0;
	list_for_each_entry(cdev, &nodemgr_ud_class.children, node) {
		ud = container_of(cdev, struct unit_directory, class_dev);
		if (ud->ne == ne)
			count++;
	}
	if (!count) {
		up(&nodemgr_ud_class.sem);
		mutex_unlock(&nodemgr_serialize_remove_uds);
		return;
	}
	unreg = kcalloc(count, sizeof(*unreg), GFP_KERNEL);
	if (!unreg) {
		HPSB_ERR("NodeMgr: out of memory in nodemgr_remove_uds");
		up(&nodemgr_ud_class.sem);
		mutex_unlock(&nodemgr_serialize_remove_uds);
		return;
	}
	i = 0;
		list_for_each_entry(cdev, &nodemgr_ud_class.children, node) {
		ud = container_of(cdev, struct unit_directory, class_dev);
		if (ud->ne == ne) {
			BUG_ON(i >= count);
			unreg[i++] = ud;
			tmp = container_of(cdev, struct unit_directory,
					   class_dev);
			if (tmp->ne == ne) {
				ud = tmp;
				break;
			}
		}
		up(&nodemgr_ud_class.sem);

	for (i = 0; i < count; i++) {
		class_device_unregister(&unreg[i]->class_dev);
		device_unregister(&unreg[i]->device);
		if (ud == NULL)
			break;
		class_device_unregister(&ud->class_dev);
		device_unregister(&ud->device);
	}
	kfree(unreg);

	mutex_unlock(&nodemgr_serialize_remove_uds);
}