@@ -400,8 +400,6 @@ static void vmbus_release_relid(u32 relid)
400
400
401
401
void hv_process_channel_removal (struct vmbus_channel * channel )
402
402
{
403
- unsigned long flags ;
404
-
405
403
lockdep_assert_held (& vmbus_connection .channel_mutex );
406
404
BUG_ON (!channel -> rescind );
407
405
@@ -422,14 +420,10 @@ void hv_process_channel_removal(struct vmbus_channel *channel)
422
420
if (channel -> offermsg .child_relid != INVALID_RELID )
423
421
vmbus_channel_unmap_relid (channel );
424
422
425
- if (channel -> primary_channel == NULL ) {
423
+ if (channel -> primary_channel == NULL )
426
424
list_del (& channel -> listentry );
427
- } else {
428
- struct vmbus_channel * primary_channel = channel -> primary_channel ;
429
- spin_lock_irqsave (& primary_channel -> lock , flags );
425
+ else
430
426
list_del (& channel -> sc_list );
431
- spin_unlock_irqrestore (& primary_channel -> lock , flags );
432
- }
433
427
434
428
/*
435
429
* If this is a "perf" channel, updates the hv_numa_map[] masks so that
@@ -470,7 +464,6 @@ static void vmbus_add_channel_work(struct work_struct *work)
470
464
struct vmbus_channel * newchannel =
471
465
container_of (work , struct vmbus_channel , add_channel_work );
472
466
struct vmbus_channel * primary_channel = newchannel -> primary_channel ;
473
- unsigned long flags ;
474
467
int ret ;
475
468
476
469
/*
@@ -531,13 +524,10 @@ static void vmbus_add_channel_work(struct work_struct *work)
531
524
*/
532
525
newchannel -> probe_done = true;
533
526
534
- if (primary_channel == NULL ) {
527
+ if (primary_channel == NULL )
535
528
list_del (& newchannel -> listentry );
536
- } else {
537
- spin_lock_irqsave (& primary_channel -> lock , flags );
529
+ else
538
530
list_del (& newchannel -> sc_list );
539
- spin_unlock_irqrestore (& primary_channel -> lock , flags );
540
- }
541
531
542
532
/* vmbus_process_offer() has mapped the channel. */
543
533
vmbus_channel_unmap_relid (newchannel );
@@ -557,7 +547,6 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
557
547
{
558
548
struct vmbus_channel * channel ;
559
549
struct workqueue_struct * wq ;
560
- unsigned long flags ;
561
550
bool fnew = true;
562
551
563
552
/*
@@ -609,10 +598,10 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
609
598
}
610
599
}
611
600
612
- if (fnew )
601
+ if (fnew ) {
613
602
list_add_tail (& newchannel -> listentry ,
614
603
& vmbus_connection .chn_list );
615
- else {
604
+ } else {
616
605
/*
617
606
* Check to see if this is a valid sub-channel.
618
607
*/
@@ -630,9 +619,7 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel)
630
619
* Process the sub-channel.
631
620
*/
632
621
newchannel -> primary_channel = channel ;
633
- spin_lock_irqsave (& channel -> lock , flags );
634
622
list_add_tail (& newchannel -> sc_list , & channel -> sc_list );
635
- spin_unlock_irqrestore (& channel -> lock , flags );
636
623
}
637
624
638
625
vmbus_channel_map_relid (newchannel );
0 commit comments