lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 028/234] random: remove unnecessary unlikely()
    Date
    From: Yangtao Li <tiny.windzz@gmail.com>

    commit 870e05b1b18814911cb2703a977f447cb974f0f9 upstream.

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

    Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
    Link: https://lore.kernel.org/r/20190607182517.28266-1-tiny.windzz@gmail.com
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/char/random.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/char/random.c
    +++ b/drivers/char/random.c
    @@ -738,10 +738,9 @@ retry:
    } 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;
    @@ -1383,10 +1382,9 @@ retry:
    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);

    \
     
     \ /
      Last update: 2022-06-23 19:57    [W:3.451 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site