From: Samuel Just <sam.just@inktank.com>
Date: Mon, 1 Apr 2013 23:16:13 +0000 (-0700)
Subject: FileStore: rename debug_delete_obj to debug_obj_on_delete
X-Git-Tag: v0.62~113^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3fa3b676f96a84829b09ffffc49e6248af75a373;p=ceph.git

FileStore: rename debug_delete_obj to debug_obj_on_delete

This should make the method intent less confusing.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index c3a0cd852f20..9d393022f147 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -352,7 +352,7 @@ int FileStore::lfn_unlink(coll_t cid, const hobject_t& o,
 	return r;
       }
       if (g_conf->filestore_debug_inject_read_err) {
-	debug_delete_obj(o);
+	debug_obj_on_delete(o);
       }
     } else {
       /* Ensure that replay of this op doesn't result in the object_map
@@ -3807,7 +3807,7 @@ void FileStore::inject_mdata_error(const hobject_t &oid) {
   dout(10) << __func__ << ": init error on " << oid << dendl;
   mdata_error_set.insert(oid);
 }
-void FileStore::debug_delete_obj(const hobject_t &oid) {
+void FileStore::debug_obj_on_delete(const hobject_t &oid) {
   Mutex::Locker l(read_error_lock);
   dout(10) << __func__ << ": clear error on " << oid << dendl;
   data_error_set.erase(oid);
diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index b73f2ad3f0cd..ebe022561a54 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -418,7 +418,7 @@ public:
   set<hobject_t> mdata_error_set; // getattr(),stat() will return -EIO
   void inject_data_error(const hobject_t &oid);
   void inject_mdata_error(const hobject_t &oid);
-  void debug_delete_obj(const hobject_t &oid);
+  void debug_obj_on_delete(const hobject_t &oid);
   bool debug_data_eio(const hobject_t &oid);
   bool debug_mdata_eio(const hobject_t &oid);