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

Commit b762799d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code" 



This reverts commit 90d33f3e as it's not
the correct fix for this issue, and it causes a build warning to be
added to the kernel tree.

Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90d33f3e

drivers/hv/channel_mgmt.c

+6 −2
Original line number Diff line number Diff line
@@ -203,7 +203,6 @@ static void vmbus_process_rescind_offer(struct work_struct *work) 
	struct vmbus_channel *primary_channel;

	struct vmbus_channel_relid_released msg;



	if (channel->device_obj)

	vmbus_device_unregister(channel->device_obj);

	memset(&msg, 0, sizeof(struct vmbus_channel_relid_released));

	msg.child_relid = channel->offermsg.child_relid;
@@ -214,6 +213,11 @@ static void vmbus_process_rescind_offer(struct work_struct *work) 
		spin_lock_irqsave(&vmbus_connection.channel_lock, flags);

		list_del(&channel->listentry);

		spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);

	} else {

		primary_channel = channel->primary_channel;

		spin_lock_irqsave(&primary_channel->sc_lock, flags);

		list_del(&channel->listentry);

		spin_unlock_irqrestore(&primary_channel->sc_lock, flags);

	}

	free_channel(channel);

}