mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-10 07:00:48 +00:00
Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code"
This reverts commit 90d33f3ec519db19d785216299a4ee85ef58ec97 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
90d33f3ec5
commit
b762799dd8
@ -203,8 +203,7 @@ 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);
|
||||
vmbus_device_unregister(channel->device_obj);
|
||||
memset(&msg, 0, sizeof(struct vmbus_channel_relid_released));
|
||||
msg.child_relid = channel->offermsg.child_relid;
|
||||
msg.header.msgtype = CHANNELMSG_RELID_RELEASED;
|
||||
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user