From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Thu, 28 Mar 2013 02:07:18 +0000 (+0000)
Subject: ceph: propagate do_command()'s return value to user space
X-Git-Tag: v0.60~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06a1e9c0ec8e81e362b5588e9ed1c1318638f027;p=ceph.git

ceph: propagate do_command()'s return value to user space

We were returning '1' regardless of what do_command() returned in case
of error.  This would make building tools relying on command error codes
short of useless, and forced them to rely instead on error messages.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit e91405d540ce11b9996e4977212553bd33afb3ed)
---

diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index d17c2426c94d..d1d50794c5ee 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -337,8 +337,9 @@ int main(int argc, const char **argv)
 	  }
 
 	  bufferlist obl;
-	  if (do_command(ctx, cmd, indata, obl) < 0) {
-	    ret = 1;
+	  ret = do_command(ctx, cmd, indata, obl);
+	  if (ret < 0) {
+	    ret = -ret;
 	    break;
 	  }
 	  outbl.claim(obl);