Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f757cad authored by Yangtao Li's avatar Yangtao Li Committed by Greg Kroah-Hartman
Browse files

random: remove unnecessary unlikely() 



commit 870e05b1b18814911cb2703a977f447cb974f0f9 upstream.

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

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20190607182517.28266-1-tiny.windzz@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4431c366

drivers/char/random.c

+2 −4
Original line number Diff line number Diff line
@@ -737,10 +737,9 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) 
		} 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",

			r->name, entropy_count);

		WARN_ON(1);

		entropy_count = 0;

	} else if (entropy_count > pool_size)

		entropy_count = pool_size;
@@ -1384,10 +1383,9 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, 
	if (ibytes < min)

		ibytes = 0;



	if (unlikely(entropy_count < 0)) {

	if (WARN_ON(entropy_count < 0)) {

		pr_warn("random: negative entropy count: pool %s count %d\n",

			r->name, entropy_count);

		WARN_ON(1);

		entropy_count = 0;

	}

	nfrac = ibytes << (ENTROPY_SHIFT + 3);