diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2013-10-12 14:44:20 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-10-15 15:56:58 -0500 |
| commit | 35221ecd39216bf311fc0e497af57aea33b18d45 (patch) | |
| tree | bc8b96cdad7f0b9b06ce9c1852c2cba74cb7723a /src/usr/initservice/extinitsvc | |
| parent | 7e9f61fd1751f40af0a5eabb1cb0fac7a3913666 (diff) | |
| download | talos-hostboot-35221ecd39216bf311fc0e497af57aea33b18d45.tar.gz talos-hostboot-35221ecd39216bf311fc0e497af57aea33b18d45.zip | |
Fix race conditions in initservice shutdown path.
Change-Id: I0da3c2050d5d64d20975031e093dd10978684e2b
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6663
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Andrea Y. Ma <ayma@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/initservice/extinitsvc')
| -rw-r--r-- | src/usr/initservice/extinitsvc/extinitsvc.C | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/usr/initservice/extinitsvc/extinitsvc.C b/src/usr/initservice/extinitsvc/extinitsvc.C index c6a48fa28..323624681 100644 --- a/src/usr/initservice/extinitsvc/extinitsvc.C +++ b/src/usr/initservice/extinitsvc/extinitsvc.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -116,12 +116,11 @@ void ExtInitSvc::init( errlHndl_t &io_rtaskRetErrl ) // Tell the kernel to shut down. This will not actually // happen until the last thread has ended. - InitService::getTheInstance().doShutdown( - SHUTDOWN_STATUS_EXTINITSVC_FAILED); + INITSERVICE::doShutdown(SHUTDOWN_STATUS_EXTINITSVC_FAILED); // end the task. io_rtaskRetErrl=NULL; - return; + return; #endif // end the task and pass the errorlog to initservice to be committed. @@ -131,7 +130,7 @@ void ExtInitSvc::init( errlHndl_t &io_rtaskRetErrl ) l_errl ); io_rtaskRetErrl=l_errl; - return; + return; } // finish things up, return to initservice with goodness. |
