mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

net: bridge: reduce indentation level in fdb_create

Browse source 
We can express the same logic without an "if" condition as big as the
function, just return early if the kmem_cache_alloc() call fails.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2021-10-26 17:27:40 +03:00 committed by David S. Miller
parent f6814fdcfe
commit 9574fb5580
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
net/bridge/br_fdb.c
View file

@ -382,23 +382,26 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,
unsigned long flags) unsigned long flags)
{ {
struct net_bridge_fdb_entry *fdb; struct net_bridge_fdb_entry *fdb;
int err;
fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC); fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC);
if (fdb) { if (!fdb)
memcpy(fdb->key.addr.addr, addr, ETH_ALEN); return NULL;
WRITE_ONCE(fdb->dst, source);
fdb->key.vlan_id = vid; memcpy(fdb->key.addr.addr, addr, ETH_ALEN);
fdb->flags = flags; WRITE_ONCE(fdb->dst, source);
fdb->updated = fdb->used = jiffies; fdb->key.vlan_id = vid;
if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl, fdb->flags = flags;
&fdb->rhnode, fdb->updated = fdb->used = jiffies;
br_fdb_rht_params)) { err = rhashtable_lookup_insert_fast(&br->fdb_hash_tbl, &fdb->rhnode,
kmem_cache_free(br_fdb_cache, fdb); br_fdb_rht_params);
fdb = NULL; if (err) {
} else { kmem_cache_free(br_fdb_cache, fdb);
hlist_add_head_rcu(&fdb->fdb_node, &br->fdb_list); return NULL;
}
} }
hlist_add_head_rcu(&fdb->fdb_node, &br->fdb_list);
return fdb; return fdb;
} }