lkml.org 
[lkml]   [2014]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 33/55] rcutorture: Clean up rcu_torture_init() error checking
    Date
    From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

    This commit applies some simple cleanups to rcu_torture_init() error
    checking.

    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    kernel/rcu/rcutorture.c | 31 ++++++++++---------------------
    1 file changed, 10 insertions(+), 21 deletions(-)

    diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
    index 9f42d320531d..4402b95b376b 100644
    --- a/kernel/rcu/rcutorture.c
    +++ b/kernel/rcu/rcutorture.c
    @@ -1459,7 +1459,6 @@ rcu_torture_init(void)
    int i;
    int cpu;
    int firsterr = 0;
    - int retval;
    static struct rcu_torture_ops *torture_ops[] = {
    &rcu_ops, &rcu_bh_ops, &srcu_ops, &sched_ops,
    };
    @@ -1628,33 +1627,23 @@ rcu_torture_init(void)
    for_each_possible_cpu(i) {
    if (cpu_is_offline(i))
    continue; /* Heuristic: CPU can go offline. */
    - retval = rcutorture_booster_init(i);
    - if (retval < 0) {
    - firsterr = retval;
    + firsterr = rcutorture_booster_init(i);
    + if (firsterr)
    goto unwind;
    - }
    }
    }
    - i = torture_shutdown_init(shutdown_secs, rcu_torture_cleanup);
    - if (i != 0) {
    - firsterr = i;
    + firsterr = torture_shutdown_init(shutdown_secs, rcu_torture_cleanup);
    + if (firsterr)
    goto unwind;
    - }
    - i = torture_onoff_init(onoff_holdoff * HZ, onoff_interval * HZ);
    - if (i != 0) {
    - firsterr = i;
    + firsterr = torture_onoff_init(onoff_holdoff * HZ, onoff_interval * HZ);
    + if (firsterr)
    goto unwind;
    - }
    - i = rcu_torture_stall_init();
    - if (i != 0) {
    - firsterr = i;
    + firsterr = rcu_torture_stall_init();
    + if (firsterr)
    goto unwind;
    - }
    - retval = rcu_torture_barrier_init();
    - if (retval != 0) {
    - firsterr = retval;
    + firsterr = rcu_torture_barrier_init();
    + if (firsterr)
    goto unwind;
    - }
    if (object_debug)
    rcu_test_debug_objects();
    rcutorture_record_test_transition();
    --
    1.8.1.5


    \
     
     \ /
      Last update: 2014-02-18 05:41    [W:6.018 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site