Messages in this thread Patch in this message |  | | From | Yangtao Li <> | Subject | [PATCH 2/5] random: convert to ENTROPY_BITS | Date | Fri, 7 Jun 2019 14:25:14 -0400 |
| |
Use DEFINE_SHOW_ATTRIBUTE macro to enhance code readability.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> --- drivers/char/random.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c index bebf622c61c4..d714a458f088 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -788,7 +788,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); } /* initialize the blocking pool if necessary */ @@ -1396,8 +1396,7 @@ EXPORT_SYMBOL_GPL(add_disk_randomness); static void _xfer_secondary_pool(struct entropy_store *r, size_t nbytes); static void xfer_secondary_pool(struct entropy_store *r, size_t nbytes) { - if (!r->pull || - r->entropy_count >= (nbytes << (ENTROPY_SHIFT + 3)) || + if (!r->pull || ENTROPY_BITS(r) >= (nbytes << 3) || r->entropy_count > r->poolinfo->poolfracbits) return; @@ -1435,8 +1434,7 @@ static void push_to_pool(struct work_struct *work) push_work); BUG_ON(!r); _xfer_secondary_pool(r, random_read_wakeup_bits/8); - trace_push_to_pool(r->name, r->entropy_count >> ENTROPY_SHIFT, - r->pull->entropy_count >> ENTROPY_SHIFT); + trace_push_to_pool(r->name, ENTROPY_BITS(r), ENTROPY_BITS(r->pull)); } /* @@ -1479,8 +1477,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); } -- 2.17.0
|  |