From: Loic Dachary Date: Mon, 3 Mar 2014 14:03:52 +0000 (+0100) Subject: mon: crush_ruleset_create_erasure indent X-Git-Tag: v0.79~136^2~25 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bc607ae5f809ee39bcaf374d2e177d705d768a7;p=ceph.git mon: crush_ruleset_create_erasure indent Signed-off-by: Loic Dachary --- diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 6de382f9afca..b72c5b1d661c 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2812,34 +2812,33 @@ int OSDMonitor::crush_ruleset_create_erasure(const string &name, int *ruleset, stringstream &ss) { - *ruleset = osdmap.crush->get_rule_id(name); - if (*ruleset != -ENOENT) - return -EEXIST; - - CrushWrapper newcrush; - _get_pending_crush(newcrush); + *ruleset = osdmap.crush->get_rule_id(name); + if (*ruleset != -ENOENT) + return -EEXIST; - *ruleset = newcrush.get_rule_id(name); - if (*ruleset != -ENOENT) { - return -EALREADY; - } else { - ErasureCodeInterfaceRef erasure_code; - int err = get_erasure_code(properties_map, &erasure_code, ss); - if (err) { - ss << "failed to load plugin using properties " << properties_map; - return err; - } + CrushWrapper newcrush; + _get_pending_crush(newcrush); - err = erasure_code->create_ruleset(name, newcrush, &ss); - erasure_code.reset(); - if (err < 0) - return err; - *ruleset = err; - pending_inc.crush.clear(); - newcrush.encode(pending_inc.crush); - return 0; + *ruleset = newcrush.get_rule_id(name); + if (*ruleset != -ENOENT) { + return -EALREADY; + } else { + ErasureCodeInterfaceRef erasure_code; + int err = get_erasure_code(properties_map, &erasure_code, ss); + if (err) { + ss << "failed to load plugin using properties " << properties_map; + return err; } + err = erasure_code->create_ruleset(name, newcrush, &ss); + erasure_code.reset(); + if (err < 0) + return err; + *ruleset = err; + pending_inc.crush.clear(); + newcrush.encode(pending_inc.crush); + return 0; + } } int OSDMonitor::get_erasure_code(const map &properties,