summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2013-08-28 21:43:09 -0700
committerJosh Durgin <josh.durgin@inktank.com>2013-09-09 11:15:49 -0700
commitdd935f44a40f8fb02aff2cc0df2269c92422df1c (patch)
treec5353ebc8cdf9d6aacb1c0f386f957540c019d66 /net/ceph
parenta8d436f015b627a55ec3b1d15f13d6ab92dd892b (diff)
downloadop-kernel-dev-dd935f44a40f8fb02aff2cc0df2269c92422df1c.zip
op-kernel-dev-dd935f44a40f8fb02aff2cc0df2269c92422df1c.tar.gz
libceph: add function to ensure notifies are complete
Without a way to flush the osd client's notify workqueue, a watch event that is unregistered could continue receiving callbacks indefinitely. Unregistering the event simply means no new notifies are added to the queue, but there may still be events in the queue that will call the watch callback for the event. If the queue is flushed after the event is unregistered, the caller can be sure no more watch callbacks will occur for the canceled watch. Signed-off-by: Josh Durgin <josh.durgin@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/osd_client.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 1606f74..2b4b32a 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2216,6 +2216,17 @@ void ceph_osdc_sync(struct ceph_osd_client *osdc)
EXPORT_SYMBOL(ceph_osdc_sync);
/*
+ * Call all pending notify callbacks - for use after a watch is
+ * unregistered, to make sure no more callbacks for it will be invoked
+ */
+extern void ceph_osdc_flush_notifies(struct ceph_osd_client *osdc)
+{
+ flush_workqueue(osdc->notify_wq);
+}
+EXPORT_SYMBOL(ceph_osdc_flush_notifies);
+
+
+/*
* init, shutdown
*/
int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client)
OpenPOWER on IntegriCloud