> -----Original Message----- > From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] > Sent: Thursday, October 17, 2013 9:31 AM > To: gre...@linuxfoundation.org; KY Srinivasan; stable@vger.kernel.org > Subject: patch "Revert "Drivers: hv: vmbus: Fix a bug in channel rescind > code"" > added to char-misc tree > > > This is a note to let you know that I've just added the patch titled > > Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code" > > to my char-misc git tree which can be found at > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git > in the char-misc-linus branch. > > The patch will show up in the next release of the linux-next tree > (usually sometime within the next 24 hours during the week.) > > The patch will hopefully also be merged in Linus's tree for the > next -rc kernel release. > > If you have any questions about this process, please let me know. > > > From b762799dd8b03ec0aafc54ba165564902eac3e18 Mon Sep 17 00:00:00 2001 > From: Greg Kroah-Hartman <gre...@linuxfoundation.org> > Date: Thu, 17 Oct 2013 09:30:10 -0700 > Subject: 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.
Greg, There appears to be some merge/revert issue - somehow the check before vmbus_device_unregister() has been removed here. I have sent a patch on top of this to fix it. Regards, K. Y > > Cc: K. Y. Srinivasan <k...@microsoft.com> > Cc: <stable@vger.kernel.org> > Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> > --- > drivers/hv/channel_mgmt.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c > index eebf5663..bbff5f20 100644 > --- a/drivers/hv/channel_mgmt.c > +++ b/drivers/hv/channel_mgmt.c > @@ -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); > } > -- > 1.8.4.3.gca3854a > -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html