rgw: RGWSI_RADOS::Obj::notify() takes optional_yield

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/services/svc_rados.cc b/src/rgw/services/svc_rados.cc
index b66f0d1ba7b2e872c9bc0efd39e0df9d7272ccb1..80f75e95dc00d2bb90c286d25e7e855fd1113589 100644 (file)
--- a/src/rgw/services/svc_rados.cc
+++ b/src/rgw/services/svc_rados.cc
@@ -157,11 +157,10 @@ int RGWSI_RADOS::Obj::unwatch(uint64_t handle)
   return ref.ioctx.unwatch2(handle);
 }
 
-int RGWSI_RADOS::Obj::notify(bufferlist& bl,
-                             uint64_t timeout_ms,
-                             bufferlist *pbl)
+int RGWSI_RADOS::Obj::notify(bufferlist& bl, uint64_t timeout_ms,
+                             bufferlist *pbl, optional_yield y)
 {
-  return ref.ioctx.notify2(ref.obj.oid, bl, timeout_ms, pbl);
+  return rgw_rados_notify(ref.ioctx, ref.obj.oid, bl, timeout_ms, pbl, y);
 }
 
 void RGWSI_RADOS::Obj::notify_ack(uint64_t notify_id,

diff --git a/src/rgw/services/svc_rados.h b/src/rgw/services/svc_rados.h
index 0453eb0cded35a9532b543bf551e4f4dab99553d..89817f317b0b8c5430a2632f5c7073849aac1332 100644 (file)
--- a/src/rgw/services/svc_rados.h
+++ b/src/rgw/services/svc_rados.h
@@ -79,9 +79,8 @@ public:
     int watch(uint64_t *handle, librados::WatchCtx2 *ctx);
     int aio_watch(librados::AioCompletion *c, uint64_t *handle, librados::WatchCtx2 *ctx);
     int unwatch(uint64_t handle);
-    int notify(bufferlist& bl,
-               uint64_t timeout_ms,
-               bufferlist *pbl);
+    int notify(bufferlist& bl, uint64_t timeout_ms,
+               bufferlist *pbl, optional_yield y);
     void notify_ack(uint64_t notify_id,
                     uint64_t cookie,
                     bufferlist& bl);