diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-08-30 20:01:48 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-10-06 11:28:44 -0700 |
| commit | a36a99618b1adb2d6ca0b7e08e3a656a04e477fe (patch) | |
| tree | f99dc4e3e38f8c51ccd96435e3c917e3f4a60cec /kernel/locking | |
| parent | a8c06024d0b557b465ad40b87ef0b51a428f99fd (diff) | |
| download | blackbird-op-linux-a36a99618b1adb2d6ca0b7e08e3a656a04e477fe.tar.gz blackbird-op-linux-a36a99618b1adb2d6ca0b7e08e3a656a04e477fe.zip | |
locktorture: Fix module unwind when bad torture_type specified
The locktorture module has a list of torture types, and specifying
a type not on this list is supposed to cleanly fail the module load.
Unfortunately, the "fail" happens without the "cleanly". This commit
therefore adds the needed clean-up after an incorrect torture_type.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/locktorture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 32244186f1f2..820852f69858 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -661,11 +661,11 @@ static int __init lock_torture_init(void) for (i = 0; i < ARRAY_SIZE(torture_ops); i++) pr_alert(" %s", torture_ops[i]->name); pr_alert("\n"); - torture_init_end(); - return -EINVAL; + firsterr = -EINVAL; + goto unwind; } if (cxt.cur_ops->init) - cxt.cur_ops->init(); /* no "goto unwind" prior to this point!!! */ + cxt.cur_ops->init(); if (nwriters_stress >= 0) cxt.nrealwriters_stress = nwriters_stress; |
