]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cls_rbd.cc: reduce scope of local variable
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 1 Apr 2015 16:25:00 +0000 (18:25 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 15 Apr 2015 10:34:50 +0000 (12:34 +0200)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/cls/rbd/cls_rbd.cc

index c8748651d5b9bf89109ee3eb5a88d4c4c46a2443..42207da86abf067889cf2ba776d85661e10391a4 100644 (file)
@@ -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());