@@ -356,10 +356,9 @@ cifs_disable_secondary_channels(struct cifs_ses *ses)
356
356
357
357
/*
358
358
* update the iface for the channel if necessary.
359
- * will return 0 when iface is updated, 1 if removed, 2 otherwise
360
359
* Must be called with chan_lock held.
361
360
*/
362
- int
361
+ void
363
362
cifs_chan_update_iface (struct cifs_ses * ses , struct TCP_Server_Info * server )
364
363
{
365
364
unsigned int chan_index ;
@@ -368,20 +367,19 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
368
367
struct cifs_server_iface * old_iface = NULL ;
369
368
struct cifs_server_iface * last_iface = NULL ;
370
369
struct sockaddr_storage ss ;
371
- int rc = 0 ;
372
370
373
371
spin_lock (& ses -> chan_lock );
374
372
chan_index = cifs_ses_get_chan_index (ses , server );
375
373
if (chan_index == CIFS_INVAL_CHAN_INDEX ) {
376
374
spin_unlock (& ses -> chan_lock );
377
- return 0 ;
375
+ return ;
378
376
}
379
377
380
378
if (ses -> chans [chan_index ].iface ) {
381
379
old_iface = ses -> chans [chan_index ].iface ;
382
380
if (old_iface -> is_active ) {
383
381
spin_unlock (& ses -> chan_lock );
384
- return 1 ;
382
+ return ;
385
383
}
386
384
}
387
385
spin_unlock (& ses -> chan_lock );
@@ -394,7 +392,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
394
392
if (!ses -> iface_count ) {
395
393
spin_unlock (& ses -> iface_lock );
396
394
cifs_dbg (VFS , "server %s does not advertise interfaces\n" , ses -> server -> hostname );
397
- return 0 ;
395
+ return ;
398
396
}
399
397
400
398
last_iface = list_last_entry (& ses -> iface_list , struct cifs_server_iface ,
@@ -434,7 +432,6 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
434
432
}
435
433
436
434
if (list_entry_is_head (iface , & ses -> iface_list , iface_head )) {
437
- rc = 1 ;
438
435
iface = NULL ;
439
436
cifs_dbg (FYI , "unable to find a suitable iface\n" );
440
437
}
@@ -449,7 +446,7 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
449
446
}
450
447
451
448
spin_unlock (& ses -> iface_lock );
452
- return 0 ;
449
+ return ;
453
450
}
454
451
455
452
/* now drop the ref to the current iface */
@@ -478,13 +475,13 @@ cifs_chan_update_iface(struct cifs_ses *ses, struct TCP_Server_Info *server)
478
475
chan_index = cifs_ses_get_chan_index (ses , server );
479
476
if (chan_index == CIFS_INVAL_CHAN_INDEX ) {
480
477
spin_unlock (& ses -> chan_lock );
481
- return 0 ;
478
+ return ;
482
479
}
483
480
484
481
ses -> chans [chan_index ].iface = iface ;
485
482
spin_unlock (& ses -> chan_lock );
486
483
487
- return rc ;
484
+ return ;
488
485
}
489
486
490
487
/*
0 commit comments