From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 21 Jun 2016 06:33:32 +0000 (+0800)
Subject: os/bluestore: fix a typo(nonexistant->nonexistent)
X-Git-Tag: v11.0.0~96^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=858a2bd43b47720bf01d35b5cc8ebd78b3015d41;p=ceph.git

os/bluestore: fix a typo(nonexistant->nonexistent)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h
index ab4d60a4775c4..91718ab4d8214 100644
--- a/src/kv/KeyValueDB.h
+++ b/src/kv/KeyValueDB.h
@@ -299,7 +299,7 @@ public:
   class MergeOperator {
     public:
     /// Merge into a key that doesn't exist
-    virtual void merge_nonexistant(
+    virtual void merge_nonexistent(
       const char *rdata, size_t rlen,
       std::string *new_value) = 0;
     /// Merge into a key that does exist
diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index a9cb9f37d3e98..826328ea32e48 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -73,7 +73,7 @@ class RocksDBStore::MergeOperatorRouter : public rocksdb::AssociativeMergeOperat
 			  value.data(), value.size(),
 			  new_value);
         } else {
-          p.second->merge_nonexistant(value.data(), value.size(), new_value);
+          p.second->merge_nonexistent(value.data(), value.size(), new_value);
         }
         break;
       }
diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc
index c51b702aa2cb8..3cc3f0b2a1a54 100644
--- a/src/os/bluestore/BitmapFreelistManager.cc
+++ b/src/os/bluestore/BitmapFreelistManager.cc
@@ -18,7 +18,7 @@ void make_offset_key(uint64_t offset, std::string *key)
 }
 
 struct XorMergeOperator : public KeyValueDB::MergeOperator {
-  virtual void merge_nonexistant(
+  virtual void merge_nonexistent(
     const char *rdata, size_t rlen, std::string *new_value) override {
     *new_value = std::string(rdata, rlen);
   }
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 26c208aae857d..14ecf54ff4898 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -560,7 +560,7 @@ void BlueStore::Cache::_audit_lru(const char *when)
 #endif
 
 struct Int64ArrayMergeOperator : public KeyValueDB::MergeOperator {
-  virtual void merge_nonexistant(
+  virtual void merge_nonexistent(
     const char *rdata, size_t rlen, std::string *new_value) override {
     *new_value = std::string(rdata, rlen);
   }
diff --git a/src/test/objectstore/test_kv.cc b/src/test/objectstore/test_kv.cc
index 828411d2a354a..57d2d48056f68 100644
--- a/src/test/objectstore/test_kv.cc
+++ b/src/test/objectstore/test_kv.cc
@@ -160,7 +160,7 @@ TEST_P(KVTest, BenchCommit) {
 }
 
 struct AppendMOP : public KeyValueDB::MergeOperator {
-  virtual void merge_nonexistant(
+  virtual void merge_nonexistent(
     const char *rdata, size_t rlen, std::string *new_value) override {
     *new_value = "?" + std::string(rdata, rlen);
   }