summaryrefslogtreecommitdiffstats
path: root/src/global
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-05-07 17:32:52 +0200
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-05-10 19:19:58 +0200
commitcc3376cf916ff17041220eb70f2732d61e908f08 (patch)
tree0fcbf74b0e0aa55d2082ad887e0309cb6233dee3 /src/global
parentcrush/builder.c: reduce scope of oldsize in crush_add_bucket() (diff)
downloadceph-cc3376cf916ff17041220eb70f2732d61e908f08.tar.xz
ceph-cc3376cf916ff17041220eb70f2732d61e908f08.zip
global/global_init.cc: reduce scope of ret in global_init_daemonize()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Diffstat (limited to 'src/global')
-rw-r--r--src/global/global_init.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 91733f5968b..e8bfb168854 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -175,8 +175,6 @@ void global_init_daemonize(CephContext *cct, int flags)
void global_init_postfork(CephContext *cct, int flags)
{
- int ret;
-
// restart log thread
g_ceph_context->_log->start();
@@ -208,7 +206,7 @@ void global_init_postfork(CephContext *cct, int flags)
exit(1);
}
if (!(flags & CINIT_FLAG_NO_CLOSE_STDERR)) {
- ret = global_init_shutdown_stderr(cct);
+ int ret = global_init_shutdown_stderr(cct);
if (ret) {
derr << "global_init_daemonize: global_init_shutdown_stderr failed with "
<< "error code " << ret << dendl;