From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 1 Apr 2015 16:25:00 +0000 (+0200)
Subject: cls_rbd.cc: reduce scope of local variable
X-Git-Tag: v9.0.1~128^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfe9f1d06b973738fbd43df25729d3b8dac3fc38;p=ceph.git

cls_rbd.cc: reduce scope of local variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index c8748651d5b9..42207da86abf 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -2256,11 +2256,10 @@ int metadata_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
   map<string, bufferlist> data;
   string last_read = metadata_key_for_name(start_after);
   int max_read = max_return ? MIN(RBD_MAX_KEYS_READ, max_return) : RBD_MAX_KEYS_READ;
-  int r;
 
   do {
     map<string, bufferlist> raw_data;
-    r = cls_cxx_map_get_vals(hctx, last_read, RBD_METADATA_KEY_PREFIX,
+    int r = cls_cxx_map_get_vals(hctx, last_read, RBD_METADATA_KEY_PREFIX,
                              max_read, &raw_data);
     if (r < 0) {
       CLS_ERR("failed to read the vals off of disk: %s", cpp_strerror(r).c_str());