Drivers: hv: vmbus: decrease num_sc on subchannel removal
authorVitaly Kuznetsov <vkuznets@redhat.com>
Thu, 7 May 2015 00:47:44 +0000 (17:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 May 2015 19:19:00 +0000 (12:19 -0700)
It is unlikely that that host will ask us to close only one subchannel for a
device but let's be consistent. Do both num_sc++ and num_sc-- with
channel->lock to be on the safe side.

Signed-off-by: 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 b28cbdf..c53a171 100644 (file)
@@ -205,6 +205,7 @@ void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid)
                primary_channel = channel->primary_channel;
                spin_lock_irqsave(&primary_channel->lock, flags);
                list_del(&channel->sc_list);
+               primary_channel->num_sc--;
                spin_unlock_irqrestore(&primary_channel->lock, flags);
        }
        free_channel(channel);
@@ -265,8 +266,8 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
                        newchannel->primary_channel = channel;
                        spin_lock_irqsave(&channel->lock, flags);
                        list_add_tail(&newchannel->sc_list, &channel->sc_list);
-                       spin_unlock_irqrestore(&channel->lock, flags);
                        channel->num_sc++;
+                       spin_unlock_irqrestore(&channel->lock, flags);
                } else
                        goto err_free_chan;
        }