Merge pull request ceph#12716 from kylinstorage/wip-ctypos_h

misc: fix code typos in header files Reviewed-by: xie xingguo <[email protected]>
att · Dec 30, 2016 · 4e657c7 · 4e657c7
2 parents 6f53f56 + fed8aaa
commit 4e657c7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/common/hobject.h b/src/common/hobject.h
@@ -96,7 +96,7 @@ struct hobject_t {
 
   hobject_t(const hobject_t &rhs) = default;
   hobject_t(hobject_t &&rhs) = default;
-  hobject_t(hobject_t_max &&singleon) : hobject_t() {
+  hobject_t(hobject_t_max &&singleton) : hobject_t() {
     max = true;
   }
   hobject_t &operator=(const hobject_t &rhs) = default;

diff --git a/src/journal/JournalTrimmer.h b/src/journal/JournalTrimmer.h
@@ -34,13 +34,13 @@ class JournalTrimmer {
   typedef std::function<Context*()> CreateContext;
 
   struct MetadataListener : public JournalMetadataListener {
-    JournalTrimmer *journal_trimmmer;
+    JournalTrimmer *journal_trimmer;
 
-    MetadataListener(JournalTrimmer *journal_trimmmer)
-      : journal_trimmmer(journal_trimmmer) {
+    MetadataListener(JournalTrimmer *journal_trimmer)
+      : journal_trimmer(journal_trimmer) {
     }
     void handle_update(JournalMetadata *) {
-      journal_trimmmer->handle_metadata_updated();
+      journal_trimmer->handle_metadata_updated();
     }
   };
 

diff --git a/src/librados/IoCtxImpl.h b/src/librados/IoCtxImpl.h
@@ -89,7 +89,7 @@ struct librados::IoCtxImpl {
 
   string get_cached_pool_name();
 
-  int get_object_hash_position(const std::string& oid, uint32_t *hash_postion);
+  int get_object_hash_position(const std::string& oid, uint32_t *hash_position);
   int get_object_pg_hash_position(const std::string& oid, uint32_t *pg_hash_position);
 
   ::ObjectOperation *prepare_assert_ops(::ObjectOperation *op);

diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h
@@ -80,7 +80,7 @@ class MMDSSlaveRequest : public Message {
 
     case OP_DROPLOCKS: return "drop_locks";
 
-    case OP_RENAMENOTIFY: return "reame_notify";
+    case OP_RENAMENOTIFY: return "rename_notify";
     case OP_RENAMENOTIFYACK: return "rename_notify_ack";
 
     case OP_ABORT: return "abort";

diff --git a/src/tools/rbd_mirror/Replayer.h b/src/tools/rbd_mirror/Replayer.h
@@ -67,7 +67,7 @@ class Replayer {
   int mirror_image_status_init();
   void mirror_image_status_shut_down();
 
-  int init_rados(const std::string &cluser_name, const std::string &client_name,
+  int init_rados(const std::string &cluster_name, const std::string &client_name,
                  const std::string &description, RadosRef *rados_ref);
 
   Threads *m_threads;

diff --git a/src/tools/rbd_recover_tool/epoch_h b/src/tools/rbd_recover_tool/epoch_h
@@ -42,7 +42,7 @@ function get_infos_seq()
   local infos_key=`get_map_header_key $keyword`
 
   if [ "$infos_key"x = ""x ];then
-    echo "$func: keyword not input or infos_key not exisits"
+    echo "$func: keyword not input or infos_key not exists"
     exit 
   fi
   local prefix=`get_map_header_prefix`
@@ -74,7 +74,7 @@ function get_pg_epoch()
 
   pg_epoch=`get_header_kv $prefix $key int`
   if [ "$pg_epoch"x = ""x ];then
-    echo "$func: $key not exisits"
+    echo "$func: $key not exists"
     exit
   fi
 }