summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-06-18 00:04:25 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-06-18 00:04:25 -0700
commit1ecec3a1fc9f6b16b575eac4405c2bed7a6b488c (patch)
tree4e3b548eae7711ffc3c840d9d0f086c291c3cf46
parent8d5fc708ff711dfcedd78f5700776c893ef91a38 (diff)
downloadceph-1ecec3a1fc9f6b16b575eac4405c2bed7a6b488c.tar.gz
cls_statelog: fixes
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
-rw-r--r--src/cls/statelog/cls_statelog.cc2
-rw-r--r--src/cls/statelog/cls_statelog_client.cc8
-rw-r--r--src/cls/statelog/cls_statelog_client.h8
3 files changed, 9 insertions, 9 deletions
diff --git a/src/cls/statelog/cls_statelog.cc b/src/cls/statelog/cls_statelog.cc
index 8daaa415447..251e7c904b4 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 9f82533956c..486daf227d4 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 2a9c4c06bd1..310bc44d403 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);