librbd: 'rbd cache enabled' -> 'rbd cache'

'enabled' is useless verbiage.  We should fix the rgw option too,
protably...

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 889b8391d629fb6407d1e0fda709a621b9514380..23bdbc375bb5a54ea3b43237759832b99c932e23 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -363,7 +363,7 @@ OPTION(journal_queue_max_bytes, OPT_INT, 100 << 20)
 OPTION(journal_align_min_size, OPT_INT, 64 << 10)  // align data payloads >= this.
 OPTION(journal_replay_from, OPT_INT, 0)
 OPTION(journal_zero_on_create, OPT_BOOL, false)
-OPTION(rbd_cache_enabled, OPT_BOOL, false) // whether to enable writeback caching
+OPTION(rbd_cache, OPT_BOOL, false) // whether to enable writeback caching
 OPTION(rgw_cache_enabled, OPT_BOOL, true)   // rgw cache enabled
 OPTION(rgw_cache_lru_size, OPT_INT, 10000)   // num of entries in rgw cache
 OPTION(rgw_socket_path, OPT_STR, "")   // path to unix domain socket, if not specified, rgw will not run as external fcgi

diff --git a/src/librbd.cc b/src/librbd.cc
index fbcded73129f9ddce62e4f41c65ea20df95e811c..79382b8e547d762c5735ea23e1183b5896ecbc2a 100644 (file)
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -99,7 +99,7 @@ namespace librbd {
     {
       md_ctx.dup(p);
       data_ctx.dup(p);
-      if (cct->_conf->rbd_cache_enabled) {
+      if (cct->_conf->rbd_cache) {
        Mutex::Locker l(cache_lock);
        ldout(cct, 20) << "enabling writback caching..." << dendl;
        writeback_handler = new LibrbdWriteback(data_ctx, cache_lock);