From: Haomai Wang <haomaiwang@gmail.com>
Date: Thu, 9 Apr 2015 08:06:06 +0000 (+0800)
Subject: Librbd: aware_metadata_confs->apply_metadata_confs
X-Git-Tag: v9.0.1~147^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=899a0e1a2316ee8a543747fe8c45c6b2b97a35dc;p=ceph.git

Librbd: aware_metadata_confs->apply_metadata_confs

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index 60d7ec966bff..64c7ee670b51 100644
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -150,7 +150,7 @@ namespace librbd {
       }
 
       header_oid = header_name(id);
-      aware_metadata_confs();
+      apply_metadata_confs();
       r = cls_client::get_immutable_metadata(&md_ctx, header_oid,
 					     &object_prefix, &order);
       if (r < 0) {
@@ -169,7 +169,7 @@ namespace librbd {
 
       init_layout();
     } else {
-      aware_metadata_confs();
+      apply_metadata_confs();
       header_oid = old_header_name(name);
     }
 
@@ -832,7 +832,7 @@ namespace librbd {
     }
   }
 
-  bool ImageCtx::_aware_metadata_confs(const string &prefix, const std::vector<string> &configs,
+  bool ImageCtx::_filter_metadata_confs(const string &prefix, const std::vector<string> &configs,
                                        map<string, bufferlist> &pairs, map<string, bufferlist> *res) {
     size_t conf_prefix_len = prefix.size();
 
@@ -853,7 +853,7 @@ namespace librbd {
     return true;
   }
 
-  void ImageCtx::aware_metadata_confs() {
+  void ImageCtx::apply_metadata_confs() {
     ldout(cct, 20) << __func__ << dendl;
     static uint64_t max_conf_items = 128;
 
@@ -870,7 +870,7 @@ namespace librbd {
       if (pairs.empty())
         break;
       
-      is_continue = _aware_metadata_confs(METADATA_CONF_PREFIX, aware_confs, pairs, &res);
+      is_continue = _filter_metadata_confs(METADATA_CONF_PREFIX, aware_confs, pairs, &res);
       for (map<string, bufferlist>::iterator it = res.begin(); it != res.end(); ++it) {
         j = cct->_conf->set_val(it->first.c_str(), it->second.c_str());
         if (j < 0)
diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h
index 4a908e42ea4e..e3ce60b27c60 100644
--- a/src/librbd/ImageCtx.h
+++ b/src/librbd/ImageCtx.h
@@ -153,8 +153,8 @@ namespace librbd {
     bool rbd_blacklist_on_break_lock;
     uint32_t rbd_blacklist_expire_seconds;
     uint32_t rbd_request_timed_out_seconds;
-    static bool _aware_metadata_confs(const string &prefix, const std::vector<string> &configs,
-                                      map<string, bufferlist> &pairs, map<string, bufferlist> *res);
+    static bool _filter_metadata_confs(const string &prefix, const std::vector<string> &configs,
+                                       map<string, bufferlist> &pairs, map<string, bufferlist> *res);
 
     /**
      * Either image_name or image_id must be set.
@@ -232,7 +232,7 @@ namespace librbd {
     void flush_async_operations(Context *on_finish);
 
     void cancel_async_requests();
-    void aware_metadata_confs();
+    void apply_metadata_confs();
   };
 }