2 files changed, 0 insertions, 21 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 39c55d61e159..388158ff0cbc 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -107,7 +107,6 @@ struct ceph_osd_event {
         struct rb_node node;
         struct list_head osd_node;
         struct kref kref;
-        struct completion completion;
 };
 
 struct ceph_osd_event_work {
@@ -275,8 +274,6 @@ extern int ceph_osdc_create_event(struct ceph_osd_client *osdc,
                                   void (*event_cb)(u64, u64, u8, void *),
                                   void *data, struct ceph_osd_event **pevent);
 extern void ceph_osdc_cancel_event(struct ceph_osd_event *event);
-extern int ceph_osdc_wait_event(struct ceph_osd_event *event,
-                                unsigned long timeout);
 extern void ceph_osdc_put_event(struct ceph_osd_event *event);
 #endif
 
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 4322faa7c811..ad6b8b35f5ca 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1494,7 +1494,6 @@ int ceph_osdc_create_event(struct ceph_osd_client *osdc,
         RB_CLEAR_NODE(&event->node);
         kref_init(&event->kref);   /* one ref for us */
         kref_get(&event->kref);    /* one ref for the caller */
-        init_completion(&event->completion);
 
         spin_lock(&osdc->event_lock);
         event->cookie = ++osdc->event_count;
@@ -1530,7 +1529,6 @@ static void do_event_work(struct work_struct *work)
 
         dout("do_event_work completing %p\n", event);
         event->cb(ver, notify_id, opcode, event->data);
-        complete(&event->completion);
         dout("do_event_work completed %p\n", event);
         ceph_osdc_put_event(event);
         kfree(event_work);
@@ -1588,7 +1586,6 @@ static void handle_watch_notify(struct ceph_osd_client *osdc,
         return;
 
 done_err:
-        complete(&event->completion);
         ceph_osdc_put_event(event);
         return;
 
@@ -1597,21 +1594,6 @@ bad:
         return;
 }
 
-int ceph_osdc_wait_event(struct ceph_osd_event *event, unsigned long timeout)
-{
-        int err;
-
-        dout("wait_event %p\n", event);
-        err = wait_for_completion_interruptible_timeout(&event->completion,
-                                                        timeout * HZ);
-        ceph_osdc_put_event(event);
-        if (err > 0)
-                err = 0;
-        dout("wait_event %p returns %d\n", event, err);
-        return err;
-}
-EXPORT_SYMBOL(ceph_osdc_wait_event);
-
 /*
  * Register request, send initial attempt.
  */