AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 14:30:58 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

random: remove unnecessary unlikely()

Browse Source 
WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-1-tiny.windzz@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Yangtao Li 2020-01-07 16:10:28 -05:00 committed by Theodore Ts'o
parent c95ea0c69f
commit 870e05b1b1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/random.c
View File

@ -736,10 +736,9 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
} while (unlikely(entropy_count < pool_size-2 && pnfrac)); } while (unlikely(entropy_count < pool_size-2 && pnfrac));
} }
if (unlikely(entropy_count < 0)) { if (WARN_ON(entropy_count < 0)) {
pr_warn("random: negative entropy/overflow: pool %s count %d\n", pr_warn("random: negative entropy/overflow: pool %s count %d\n",
r->name, entropy_count); r->name, entropy_count);
WARN_ON(1);
entropy_count = 0; entropy_count = 0;
} else if (entropy_count > pool_size) } else if (entropy_count > pool_size)
entropy_count = pool_size; entropy_count = pool_size;
@ -1364,10 +1363,9 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
if (ibytes < min) if (ibytes < min)
ibytes = 0; ibytes = 0;
if (unlikely(entropy_count < 0)) { if (WARN_ON(entropy_count < 0)) {
pr_warn("random: negative entropy count: pool %s count %d\n", pr_warn("random: negative entropy count: pool %s count %d\n",
r->name, entropy_count); r->name, entropy_count);
WARN_ON(1);
entropy_count = 0; entropy_count = 0;
} }
nfrac = ibytes << (ENTROPY_SHIFT + 3); nfrac = ibytes << (ENTROPY_SHIFT + 3);