summaryrefslogtreecommitdiffstats
path: root/src/mon/OSDMonitor.cc
diff options
context:
space:
mode:
authorLoic Dachary <loic@dachary.org>2014-03-03 14:55:16 +0100
committerLoic Dachary <loic@dachary.org>2014-03-17 09:48:02 +0100
commit962248834b5903b8d132c6cd5a8a798497c5dd8d (patch)
tree4d9632c10290a66486eb3de4b0ba55ef3e0570f6 /src/mon/OSDMonitor.cc
parentmon: crush_ruleset_create_erasure set ruleset (diff)
downloadceph-962248834b5903b8d132c6cd5a8a798497c5dd8d.tar.xz
ceph-962248834b5903b8d132c6cd5a8a798497c5dd8d.zip
mon: crush_ruleset_create_erasure s/rule/err/
Avoid using rule instead of ruleset to help clarify the terminology. Using err instead is also clearer in the context. Signed-off-by: Loic Dachary <loic@dachary.org>
Diffstat (limited to '')
-rw-r--r--src/mon/OSDMonitor.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 7a7f731cab4..6de382f9afc 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2824,17 +2824,17 @@ int OSDMonitor::crush_ruleset_create_erasure(const string &name,
return -EALREADY;
} else {
ErasureCodeInterfaceRef erasure_code;
- err = get_erasure_code(properties_map, &erasure_code, ss);
+ int err = get_erasure_code(properties_map, &erasure_code, ss);
if (err) {
ss << "failed to load plugin using properties " << properties_map;
return err;
}
- int rule = erasure_code->create_ruleset(name, newcrush, &ss);
+ err = erasure_code->create_ruleset(name, newcrush, &ss);
erasure_code.reset();
- if (rule < 0)
- return rule;
- *ruleset = rule;
+ if (err < 0)
+ return err;
+ *ruleset = err;
pending_inc.crush.clear();
newcrush.encode(pending_inc.crush);
return 0;