random: entropy_bytes is actually bits

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>

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