Modified Files:

 	ObjectCacher.cc ObjectCacher.h
Partial checkin

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@762 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/osdc/ObjectCacher.cc b/ceph/osdc/ObjectCacher.cc
index 16d5e8651441eb884369cc9a9e96c79825198f82..9c1785c88061c794f886ac22ace5565b338aeab3 100644 (file)
--- a/ceph/osdc/ObjectCacher.cc
+++ b/ceph/osdc/ObjectCacher.cc
@@ -299,13 +299,25 @@ int ObjectCacher::Object::map_write(Objecter::OSDWrite *wr)
 
 /* private */
 
-void bh_read(Object *ob, BufferHead *bh)
+bool ObjectCacher::bh_cancel_read(BufferHead *bh)
 {
   assert(0);
   return(0);
 }
 
-void bh_write(Object *ob, BufferHead *bh)
+bool ObjectCacher::bh_cancel_write(BufferHead *bh)
+{
+  assert(0);
+  return(0);
+}
+
+void ObjectCacher::bh_read(Object *ob, BufferHead *bh)
+{
+  assert(0);
+  return(0);
+}
+
+void ObjectCacher::bh_write(Object *ob, BufferHead *bh)
 {
   assert(0);
   return(0);

diff --git a/ceph/osdc/ObjectCacher.h b/ceph/osdc/ObjectCacher.h
index 7628985a5b46f9ae35c4eab3a7790b03de5c5dde..6ac5bdbdec33886c64896baaaa901eb0f1781d67 100644 (file)
--- a/ceph/osdc/ObjectCacher.h
+++ b/ceph/osdc/ObjectCacher.h
@@ -228,6 +228,8 @@ class ObjectCacher {
   };
 
   // io
+  bool bh_cancel_read(BufferHead *bh);
+  bool bh_cancel_write(BufferHead *bh);
   void bh_read(Object *ob, BufferHead *bh);
   void bh_write(Object *ob, BufferHead *bh);