Skip to content

Commit

Permalink
net/ipv4: fib_trie: Avoid cryptic ternary expressions
Browse files Browse the repository at this point in the history
empty_child_inc/dec() use the ternary operator for conditional
operations. The conditions involve the post/pre in/decrement
operator and the operation is only performed when the condition
is *not* true. This is hard to parse for humans, use a regular
'if' construct instead and perform the in/decrement separately.

This also fixes two warnings that are emitted about the value
of the ternary expression being unused, when building the kernel
with clang + "kbuild: Remove unnecessary -Wno-unused-value"
(https://lore.kernel.org/patchwork/patch/1089869/):

CC      net/ipv4/fib_trie.o
net/ipv4/fib_trie.c:351:2: error: expression result unused [-Werror,-Wunused-value]
        ++tn_info(n)->empty_children ? : ++tn_info(n)->full_children;

Fixes: 95f60ea ("fib_trie: Add collapse() and should_collapse() to resize")
Signed-off-by: Matthias Kaehlcke <[email protected]>
Reviewed-by: Douglas Anderson <[email protected]>
Reviewed-by: Nick Desaulniers <[email protected]>
Acked-by: Alexander Duyck <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Matthias Kaehlcke authored and davem330 committed Jun 19, 2019
1 parent 16e5a26 commit 25cec75
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions net/ipv4/fib_trie.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,18 @@ static struct tnode *tnode_alloc(int bits)

static inline void empty_child_inc(struct key_vector *n)
{
++tn_info(n)->empty_children ? : ++tn_info(n)->full_children;
tn_info(n)->empty_children++;

if (!tn_info(n)->empty_children)
tn_info(n)->full_children++;
}

static inline void empty_child_dec(struct key_vector *n)
{
tn_info(n)->empty_children-- ? : tn_info(n)->full_children--;
if (!tn_info(n)->empty_children)
tn_info(n)->full_children--;

tn_info(n)->empty_children--;
}

static struct key_vector *leaf_new(t_key key, struct fib_alias *fa)
Expand Down

0 comments on commit 25cec75

Please sign in to comment.