Drivers: hv: rename sc_lock to the more generic lock

[linux-2.6-block.git] / drivers / hv / channel_mgmt.c

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 704c0e00f8d255304eae33f09c76a8cbf26b37bc..1e0b996ed643768089b1015a6c2a66444b26f858 100644 (file)
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -146,7 +146,7 @@ static struct vmbus_channel *alloc_channel(void)
                return NULL;
 
        spin_lock_init(&channel->inbound_lock);
-       spin_lock_init(&channel->sc_lock);
+       spin_lock_init(&channel->lock);
 
        INIT_LIST_HEAD(&channel->sc_list);
        INIT_LIST_HEAD(&channel->percpu_list);
@@ -246,9 +246,9 @@ static void vmbus_process_rescind_offer(struct work_struct *work)
                spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
        } else {
                primary_channel = channel->primary_channel;
-               spin_lock_irqsave(&primary_channel->sc_lock, flags);
+               spin_lock_irqsave(&primary_channel->lock, flags);
                list_del(&channel->sc_list);
-               spin_unlock_irqrestore(&primary_channel->sc_lock, flags);
+               spin_unlock_irqrestore(&primary_channel->lock, flags);
        }
        free_channel(channel);
 }
@@ -323,9 +323,9 @@ static void vmbus_process_offer(struct work_struct *work)
                         * Process the sub-channel.
                         */
                        newchannel->primary_channel = channel;
-                       spin_lock_irqsave(&channel->sc_lock, flags);
+                       spin_lock_irqsave(&channel->lock, flags);
                        list_add_tail(&newchannel->sc_list, &channel->sc_list);
-                       spin_unlock_irqrestore(&channel->sc_lock, flags);
+                       spin_unlock_irqrestore(&channel->lock, flags);
 
                        if (newchannel->target_cpu != get_cpu()) {
                                put_cpu();