From d3df0392b788f323f66aff834bdad18c9b271630 Mon Sep 17 00:00:00 2001 From: Yangtao Li Date: Fri, 7 Jun 2019 14:25:14 -0400 Subject: [PATCH] UPSTREAM: random: convert to ENTROPY_BITS for better code readability Signed-off-by: Yangtao Li Link: https://lore.kernel.org/r/20190607182517.28266-2-tiny.windzz@gmail.com Signed-off-by: Theodore Ts'o (cherry picked from commit 12faac30d157970fdbfa171bbeb1fb88350303b1) Signed-off-by: Mark Salyzyn Bug: 148665638 Change-Id: If96c7d9b69618ec879f1de1565cff0ac057ffe84 --- drivers/char/random.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 104d632a845a..0b0c5196e067 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -760,7 +760,7 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) if (entropy_bits < 128) return; crng_reseed(&primary_crng, r); - entropy_bits = r->entropy_count >> ENTROPY_SHIFT; + entropy_bits = ENTROPY_BITS(r); } } } @@ -1378,8 +1378,7 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min, goto retry; trace_debit_entropy(r->name, 8 * ibytes); - if (ibytes && - (r->entropy_count >> ENTROPY_SHIFT) < random_write_wakeup_bits) { + if (ibytes && ENTROPY_BITS(r) < random_write_wakeup_bits) { wake_up_interruptible(&random_write_wait); kill_fasync(&fasync, SIGIO, POLL_OUT); }