Commit 3466b7a6 authored by Daniel Wagner's avatar Daniel Wagner Committed by Christoph Hellwig
Browse files

nvmet-fcloop: don't wait for lport cleanup



The lifetime of the fcloop_lsreq is not tight to the lifetime of the
host or target port, thus there is no need anymore to synchronize the
cleanup path anymore.

Signed-off-by: default avatarDaniel Wagner <wagi@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d7f7c6eb
Loading
Loading
Loading
Loading
+4 −17
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static LIST_HEAD(fcloop_nports);
struct fcloop_lport {
	struct nvme_fc_local_port *localport;
	struct list_head lport_list;
	struct completion unreg_done;
	refcount_t ref;
};

@@ -1092,9 +1091,6 @@ fcloop_localport_delete(struct nvme_fc_local_port *localport)
	struct fcloop_lport_priv *lport_priv = localport->private;
	struct fcloop_lport *lport = lport_priv->lport;

	/* release any threads waiting for the unreg to complete */
	complete(&lport->unreg_done);

	fcloop_lport_put(lport);
}

@@ -1243,18 +1239,9 @@ fcloop_create_local_port(struct device *dev, struct device_attribute *attr,
}

static int
__wait_localport_unreg(struct fcloop_lport *lport)
__localport_unreg(struct fcloop_lport *lport)
{
	int ret;

	init_completion(&lport->unreg_done);

	ret = nvme_fc_unregister_localport(lport->localport);

	if (!ret)
		wait_for_completion(&lport->unreg_done);

	return ret;
	return nvme_fc_unregister_localport(lport->localport);
}

static struct fcloop_nport *
@@ -1337,7 +1324,7 @@ fcloop_delete_local_port(struct device *dev, struct device_attribute *attr,
	if (!lport)
		return -ENOENT;

	ret = __wait_localport_unreg(lport);
	ret = __localport_unreg(lport);
	fcloop_lport_put(lport);

	return ret ? ret : count;
@@ -1783,7 +1770,7 @@ static void __exit fcloop_exit(void)

		spin_unlock_irqrestore(&fcloop_lock, flags);

		ret = __wait_localport_unreg(lport);
		ret = __localport_unreg(lport);
		if (ret)
			pr_warn("%s: Failed deleting local port\n", __func__);