hv: vmbus_free_channels(): remove the redundant free_channel()
authorDexuan Cui <decui@microsoft.com>
Thu, 23 Apr 2015 04:31:30 +0000 (21:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 May 2015 19:18:23 +0000 (12:18 -0700)
free_channel() has been invoked in
vmbus_remove() -> hv_process_channel_removal(), or vmbus_remove() ->
... -> vmbus_close_internal() -> hv_process_channel_removal().

We also change to use list_for_each_entry_safe(), because the entry
is removed in hv_process_channel_removal().

This patch fixes a bug in the vmbus unload path.

Thank Dan Carpenter for finding the issue!

Signed-off-by: Dexuan Cui <decui@microsoft.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: K. Y. Srinivasan <kys@microsoft.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hv/channel_mgmt.c

index 0eeb1b3bc0484ce75572b0f6326ca0857cb73268..865a3afa1d86b51a0f7f3500d2badf3acc2b9299 100644 (file)
@@ -212,11 +212,16 @@ void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid)
 
 void vmbus_free_channels(void)
 {
-       struct vmbus_channel *channel;
+       struct vmbus_channel *channel, *tmp;
+
+       list_for_each_entry_safe(channel, tmp, &vmbus_connection.chn_list,
+               listentry) {
+               /* if we don't set rescind to true, vmbus_close_internal()
+                * won't invoke hv_process_channel_removal().
+                */
+               channel->rescind = true;
 
-       list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) {
                vmbus_device_unregister(channel->device_obj);
-               free_channel(channel);
        }
 }