Skip to content

Commit 2f1bb1e

Browse files
q2venkuba-moo
authored andcommitted
dev: Remove devnet_rename_sem.
devnet_rename_sem is no longer used since commit 0840556 ("net: Protect dev->name by seqlock."). Also, RTNL serialises dev_change_name(). Let's remove devnet_rename_sem. Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20250115095545.52709-3-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent e361560 commit 2f1bb1e

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

net/core/dev.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ static DEFINE_SPINLOCK(napi_hash_lock);
181181
static unsigned int napi_gen_id = NR_CPUS;
182182
static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
183183

184-
static DECLARE_RWSEM(devnet_rename_sem);
185-
186184
static inline void dev_base_seq_inc(struct net *net)
187185
{
188186
unsigned int val = net->dev_base_seq + 1;
@@ -1361,23 +1359,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
13611359

13621360
net = dev_net(dev);
13631361

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))
13681363
return 0;
1369-
}
13701364

13711365
memcpy(oldname, dev->name, IFNAMSIZ);
13721366

13731367
write_seqlock_bh(&netdev_rename_lock);
13741368
err = dev_get_valid_name(net, dev, newname);
13751369
write_sequnlock_bh(&netdev_rename_lock);
13761370

1377-
if (err < 0) {
1378-
up_write(&devnet_rename_sem);
1371+
if (err < 0)
13791372
return err;
1380-
}
13811373

13821374
if (oldname[0] && !strchr(oldname, '%'))
13831375
netdev_info(dev, "renamed from %s%s\n", oldname,
@@ -1393,12 +1385,9 @@ int dev_change_name(struct net_device *dev, const char *newname)
13931385
memcpy(dev->name, oldname, IFNAMSIZ);
13941386
write_sequnlock_bh(&netdev_rename_lock);
13951387
WRITE_ONCE(dev->name_assign_type, old_assign_type);
1396-
up_write(&devnet_rename_sem);
13971388
return ret;
13981389
}
13991390

1400-
up_write(&devnet_rename_sem);
1401-
14021391
netdev_adjacent_rename_links(dev, oldname);
14031392

14041393
netdev_name_node_del(dev->name_node);
@@ -1414,7 +1403,6 @@ int dev_change_name(struct net_device *dev, const char *newname)
14141403
/* err >= 0 after dev_alloc_name() or stores the first errno */
14151404
if (err >= 0) {
14161405
err = ret;
1417-
down_write(&devnet_rename_sem);
14181406
write_seqlock_bh(&netdev_rename_lock);
14191407
memcpy(dev->name, oldname, IFNAMSIZ);
14201408
write_sequnlock_bh(&netdev_rename_lock);

0 commit comments

Comments
 (0)