From: John Spray <john.spray@redhat.com>
Date: Wed, 1 Mar 2017 15:21:51 +0000 (+0000)
Subject: osd: update for mon_command void change
X-Git-Tag: v12.0.1~93^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80eaa127b85e20660d3657758108f1907820353f;p=ceph.git

osd: update for mon_command void change

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e2135a0902c2..48b73bf50553 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3039,9 +3039,8 @@ int OSD::update_crush_location()
     bufferlist inbl;
     C_SaferCond w;
     string outs;
-    int r = monc->start_mon_command(vcmd, inbl, NULL, &outs, &w);
-    if (r == 0)
-      r = w.wait();
+    monc->start_mon_command(vcmd, inbl, NULL, &outs, &w);
+    int r = w.wait();
     if (r < 0) {
       if (r == -ENOENT && !created) {
 	string newcmd = "{\"prefix\": \"osd create\", \"id\": " + stringify(whoami)
@@ -3050,9 +3049,8 @@ int OSD::update_crush_location()
 	bufferlist inbl;
 	C_SaferCond w;
 	string outs;
-	int r = monc->start_mon_command(vnewcmd, inbl, NULL, &outs, &w);
-	if (r == 0)
-	  r = w.wait();
+	monc->start_mon_command(vnewcmd, inbl, NULL, &outs, &w);
+	int r = w.wait();
 	if (r < 0) {
 	  derr << __func__ << " fail: osd does not exist and created failed: "
 	       << cpp_strerror(r) << dendl;