leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

random: entropy_bytes is actually bits

Browse Source 
The variable 'entropy_bytes' is set from an expression that actually
counts bits.  Fortunately it's also only compared to values that also
count bits.  Rename it accordingly.

Signed-off-by: Greg Price <price@mit.edu>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Greg Price
2013-12-07 09:49:55 -05:00
committed by Theodore Ts'o
parent 0fb7a01af5
commit 7d1b08c40c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/random.c
View File

@@ -666,10 +666,10 @@ retry:
r->entropy_total, _RET_IP_); r->entropy_total, _RET_IP_);
if (r == &input_pool) { if (r == &input_pool) {
int entropy_bytes = entropy_count >> ENTROPY_SHIFT; int entropy_bits = entropy_count >> ENTROPY_SHIFT;
/* should we wake readers? */ /* should we wake readers? */
if (entropy_bytes >= random_read_wakeup_thresh) { if (entropy_bits >= random_read_wakeup_thresh) {
wake_up_interruptible(&random_read_wait); wake_up_interruptible(&random_read_wait);
kill_fasync(&fasync, SIGIO, POLL_IN); kill_fasync(&fasync, SIGIO, POLL_IN);
} }
@@ -678,7 +678,7 @@ retry:
* forth between them, until the output pools are 75% * forth between them, until the output pools are 75%
* full. * full.
*/ */
if (entropy_bytes > random_write_wakeup_thresh && if (entropy_bits > random_write_wakeup_thresh &&
r->initialized && r->initialized &&
r->entropy_total >= 2*random_read_wakeup_thresh) { r->entropy_total >= 2*random_read_wakeup_thresh) {
static struct entropy_store *last = &blocking_pool; static struct entropy_store *last = &blocking_pool;