| From | "Paul E. McKenney" <> | Subject | [PATCH tip/core/rcu 50/55] rcutorture: Gracefully handle NULL cleanup hooks | Date | Mon, 17 Feb 2014 14:12:54 -0800 |
| |
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Although most torture tests will have some cleanup hook, it is possible that one might not. This commit therefore enables graceful handling of a NULL cleanup hook during torture-test shutdown.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> --- kernel/torture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/torture.c b/kernel/torture.c index a93ee5722b50..0abaa8354bbe 100644 --- a/kernel/torture.c +++ b/kernel/torture.c @@ -454,7 +454,10 @@ static int torture_shutdown(void *arg) VERBOSE_TOROUT_STRING("torture_shutdown task shutting down system"); shutdown_task = NULL; /* Avoid self-kill deadlock. */ - torture_shutdown_hook();/* Shut down the enclosing torture test. */ + if (torture_shutdown_hook) + torture_shutdown_hook(); + else + VERBOSE_TOROUT_STRING("No torture_shutdown_hook(), skipping."); kernel_power_off(); /* Shut down the system. */ return 0; } -- 1.8.1.5
|