libceph: Remove unused ceph_osdc_watch_check

ceph_osdc_watch_check() has been unused since it was added in commit
b07d3c4bd727 ("libceph: support for checking on status of watch")

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index d7941478158cdf0bf6c9bbfa1e1e149b2d24d7b8..d55b30057a4555fdae870f9ad245eba7fe93bba0 100644 (file)
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -626,8 +626,6 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,
                     u32 timeout,
                     struct page ***preply_pages,
                     size_t *preply_len);
-int ceph_osdc_watch_check(struct ceph_osd_client *osdc,
-                         struct ceph_osd_linger_request *lreq);
 int ceph_osdc_list_watchers(struct ceph_osd_client *osdc,
                            struct ceph_object_id *oid,
                            struct ceph_object_locator *oloc,

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 9d078b37fe0b9b085894be86db17053227de9a18..9b1168eb77abb3707ab162953fa9cf380ec1795f 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -4999,40 +4999,6 @@ out_put_lreq:
 }
 EXPORT_SYMBOL(ceph_osdc_notify);
 
-/*
- * Return the number of milliseconds since the watch was last
- * confirmed, or an error.  If there is an error, the watch is no
- * longer valid, and should be destroyed with ceph_osdc_unwatch().
- */
-int ceph_osdc_watch_check(struct ceph_osd_client *osdc,
-                         struct ceph_osd_linger_request *lreq)
-{
-       unsigned long stamp, age;
-       int ret;
-
-       down_read(&osdc->lock);
-       mutex_lock(&lreq->lock);
-       stamp = lreq->watch_valid_thru;
-       if (!list_empty(&lreq->pending_lworks)) {
-               struct linger_work *lwork =
-                   list_first_entry(&lreq->pending_lworks,
-                                    struct linger_work,
-                                    pending_item);
-
-               if (time_before(lwork->queued_stamp, stamp))
-                       stamp = lwork->queued_stamp;
-       }
-       age = jiffies - stamp;
-       dout("%s lreq %p linger_id %llu age %lu last_error %d\n", __func__,
-            lreq, lreq->linger_id, age, lreq->last_error);
-       /* we are truncating to msecs, so return a safe upper bound */
-       ret = lreq->last_error ?: 1 + jiffies_to_msecs(age);
-
-       mutex_unlock(&lreq->lock);
-       up_read(&osdc->lock);
-       return ret;
-}
-
 static int decode_watcher(void **p, void *end, struct ceph_watch_item *item)
 {
        u8 struct_v;