Commit 1c110588 authored by Daniel Wagner's avatar Daniel Wagner Committed by Keith Busch
Browse files

nvmet-fc: do not tack refs on tgtports from assoc 



The association life time is tied to the life time of the target port.
That means we should not take extra a refcount when creating a
association.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 50b474e1

drivers/nvme/target/fc.c

+1 −7
Original line number Diff line number Diff line
@@ -1107,12 +1107,9 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle) 
	if (idx < 0)

		goto out_free_assoc;



	if (!nvmet_fc_tgtport_get(tgtport))

		goto out_ida;



	assoc->hostport = nvmet_fc_alloc_hostport(tgtport, hosthandle);

	if (IS_ERR(assoc->hostport))

		goto out_put;

		goto out_ida;



	assoc->tgtport = tgtport;

	assoc->a_id = idx;
@@ -1142,8 +1139,6 @@ nvmet_fc_alloc_target_assoc(struct nvmet_fc_tgtport *tgtport, void *hosthandle) 


	return assoc;



out_put:

	nvmet_fc_tgtport_put(tgtport);

out_ida:

	ida_free(&tgtport->assoc_cnt, idx);

out_free_assoc:
@@ -1180,7 +1175,6 @@ nvmet_fc_target_assoc_free(struct kref *ref) 
	dev_info(tgtport->dev,

		"{%d:%d} Association freed\n",

		tgtport->fc_target_port.port_num, assoc->a_id);

	nvmet_fc_tgtport_put(tgtport);

	kfree(assoc);

}