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

Commit 2ff717cd authored by Cathy Avery's avatar Cathy Avery Committed by Martin K. Petersen
Browse files

scsi: target: tcmu: wait for nl reply only if there are listeners or during an add 



genlmsg_multicast_allns now returns the correct statuses when a message is
sent to a listener. However in the case of adding a device we want to wait
for the listener otherwise we may miss the the device during startup.

Signed-off-by: default avatarCathy Avery <cavery@redhat.com>
Acked-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3722e6a5

drivers/target/target_core_user.c

+6 −5
Original line number Diff line number Diff line
@@ -1764,11 +1764,12 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev, 


	ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0,

				      TCMU_MCGRP_CONFIG, GFP_KERNEL);

	/* We don't care if no one is listening */

	if (ret == -ESRCH)

		ret = 0;

	if (!ret)

		ret = tcmu_wait_genl_cmd_reply(udev);



	/* Wait during an add as the listener may not be up yet */

	if (ret == 0 ||

	   (ret == -ESRCH && cmd == TCMU_CMD_ADDED_DEVICE))

		return tcmu_wait_genl_cmd_reply(udev);



	return ret;

}