From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 18 Jun 2013 07:04:25 +0000 (-0700)
Subject: cls_statelog: fixes
X-Git-Tag: v0.67-rc1~128^2~25^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ecec3a1fc9f6b16b575eac4405c2bed7a6b488c;p=ceph.git

cls_statelog: fixes

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/cls/statelog/cls_statelog.cc b/src/cls/statelog/cls_statelog.cc
index 8daaa4154473..251e7c904b4b 100644
--- a/src/cls/statelog/cls_statelog.cc
+++ b/src/cls/statelog/cls_statelog.cc
@@ -302,7 +302,7 @@ void __cls_init()
 {
   CLS_LOG(1, "Loaded log class!");
 
-  cls_register("log", &h_class);
+  cls_register("statelog", &h_class);
 
   /* log */
   cls_register_cxx_method(h_class, "add", CLS_METHOD_RD | CLS_METHOD_WR, cls_statelog_add, &h_statelog_add);
diff --git a/src/cls/statelog/cls_statelog_client.cc b/src/cls/statelog/cls_statelog_client.cc
index 9f82533956c1..486daf227d42 100644
--- a/src/cls/statelog/cls_statelog_client.cc
+++ b/src/cls/statelog/cls_statelog_client.cc
@@ -92,10 +92,10 @@ public:
   }
 };
 
-void cls_statelog_list_by_client(librados::ObjectReadOperation& op,
-                                 const string& client_id, const string& op_id, const string& object, /* op_id may be empty, also one of client_id, object*/
-                                 string& in_marker, int max_entries, list<cls_statelog_entry>& entries,
-                                 string *out_marker, bool *truncated)
+void cls_statelog_list(librados::ObjectReadOperation& op,
+                       const string& client_id, const string& op_id, const string& object, /* op_id may be empty, also one of client_id, object*/
+                       const string& in_marker, int max_entries, list<cls_statelog_entry>& entries,
+                       string *out_marker, bool *truncated)
 {
   bufferlist inbl;
   cls_statelog_list_op call;
diff --git a/src/cls/statelog/cls_statelog_client.h b/src/cls/statelog/cls_statelog_client.h
index 2a9c4c06bd1c..310bc44d403d 100644
--- a/src/cls/statelog/cls_statelog_client.h
+++ b/src/cls/statelog/cls_statelog_client.h
@@ -17,10 +17,10 @@ void cls_statelog_add(librados::ObjectWriteOperation& op, cls_statelog_entry& en
 void cls_statelog_add(librados::ObjectWriteOperation& op, const string& client_id, const string& op_id,
                  const string& object, uint32_t state, bufferlist& bl);
 
-void cls_statelog_list_by_client(librados::ObjectReadOperation& op,
-                                 const string& client_id, const string& op_id, const string& object, /* op_id may be empty, also one of client_id, object*/
-                                 string& in_marker, int max_entries, list<cls_statelog_entry>& entries,
-                                 string *out_marker, bool *truncated);
+void cls_statelog_list(librados::ObjectReadOperation& op,
+                       const string& client_id, const string& op_id, const string& object, /* op_id may be empty, also one of client_id, object*/
+                       const string& in_marker, int max_entries, list<cls_statelog_entry>& entries,
+                       string *out_marker, bool *truncated);
 
 void cls_statelog_remove_by_client(librados::ObjectWriteOperation& op, const string& client_id, const string& op_id);
 void cls_statelog_remove_by_object(librados::ObjectWriteOperation& op, const string& object, const string& op_id);