From: Sage Weil <sage.weil@dreamhost.com>
Date: Sat, 31 Mar 2012 03:18:42 +0000 (-0700)
Subject: osd: fix error code return from class methods
X-Git-Tag: v0.45~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8a53869f6db4c76516ee525f00f87f930920692;p=ceph.git

osd: fix error code return from class methods

Don't shadow the result at function scope.

Fixes: #2148
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index b2e2a3732536..96d1a7a479df 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1728,8 +1728,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	bp.copy(op.cls.indata_len, indata);
 
 	ClassHandler::ClassData *cls;
-	int result = osd->class_handler->open_class(cname, &cls);
-	assert(result == 0);
+	result = osd->class_handler->open_class(cname, &cls);
+	assert(result == 0);   // init_op_flags() already verified this works.
 
 	ClassHandler::ClassMethod *method = cls->get_method(mname.c_str());
 	if (!method) {