@@ -181,8 +181,6 @@ static DEFINE_SPINLOCK(napi_hash_lock);
181
181
static unsigned int napi_gen_id = NR_CPUS ;
182
182
static DEFINE_READ_MOSTLY_HASHTABLE (napi_hash , 8 );
183
183
184
- static DECLARE_RWSEM (devnet_rename_sem );
185
-
186
184
static inline void dev_base_seq_inc (struct net * net )
187
185
{
188
186
unsigned int val = net -> dev_base_seq + 1 ;
@@ -1361,23 +1359,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
1361
1359
1362
1360
net = dev_net (dev );
1363
1361
1364
- down_write (& devnet_rename_sem );
1365
-
1366
- if (strncmp (newname , dev -> name , IFNAMSIZ ) == 0 ) {
1367
- up_write (& devnet_rename_sem );
1362
+ if (!strncmp (newname , dev -> name , IFNAMSIZ ))
1368
1363
return 0 ;
1369
- }
1370
1364
1371
1365
memcpy (oldname , dev -> name , IFNAMSIZ );
1372
1366
1373
1367
write_seqlock_bh (& netdev_rename_lock );
1374
1368
err = dev_get_valid_name (net , dev , newname );
1375
1369
write_sequnlock_bh (& netdev_rename_lock );
1376
1370
1377
- if (err < 0 ) {
1378
- up_write (& devnet_rename_sem );
1371
+ if (err < 0 )
1379
1372
return err ;
1380
- }
1381
1373
1382
1374
if (oldname [0 ] && !strchr (oldname , '%' ))
1383
1375
netdev_info (dev , "renamed from %s%s\n" , oldname ,
@@ -1393,12 +1385,9 @@ int dev_change_name(struct net_device *dev, const char *newname)
1393
1385
memcpy (dev -> name , oldname , IFNAMSIZ );
1394
1386
write_sequnlock_bh (& netdev_rename_lock );
1395
1387
WRITE_ONCE (dev -> name_assign_type , old_assign_type );
1396
- up_write (& devnet_rename_sem );
1397
1388
return ret ;
1398
1389
}
1399
1390
1400
- up_write (& devnet_rename_sem );
1401
-
1402
1391
netdev_adjacent_rename_links (dev , oldname );
1403
1392
1404
1393
netdev_name_node_del (dev -> name_node );
@@ -1414,7 +1403,6 @@ int dev_change_name(struct net_device *dev, const char *newname)
1414
1403
/* err >= 0 after dev_alloc_name() or stores the first errno */
1415
1404
if (err >= 0 ) {
1416
1405
err = ret ;
1417
- down_write (& devnet_rename_sem );
1418
1406
write_seqlock_bh (& netdev_rename_lock );
1419
1407
memcpy (dev -> name , oldname , IFNAMSIZ );
1420
1408
write_sequnlock_bh (& netdev_rename_lock );
0 commit comments