libceph: introduce ceph_osdc_cancel_request()

Introduce ceph_osdc_cancel_request() intended for canceling requests
from the higher layers (rbd and cephfs).  Because higher layers are in
charge and are supposed to know what and when they are canceling, the
request is not completed, only unref'ed and removed from the libceph
data structures.

__cancel_request() is no longer called before __unregister_request(),
because __unregister_request() unconditionally revokes r_request and
there is no point in trying to do it twice.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index a8d5652f589dc01c12fdeeda922ba5a9dee46cdd..de09cad7b7c7152f658e40f33fed30d713de0c4d 100644 (file)
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -334,6 +334,7 @@ extern void ceph_osdc_put_request(struct ceph_osd_request *req);
 extern int ceph_osdc_start_request(struct ceph_osd_client *osdc,
                                   struct ceph_osd_request *req,
                                   bool nofail);
+extern void ceph_osdc_cancel_request(struct ceph_osd_request *req);
 extern int ceph_osdc_wait_request(struct ceph_osd_client *osdc,
                                  struct ceph_osd_request *req);
 extern void ceph_osdc_sync(struct ceph_osd_client *osdc);

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 89d7d8861d80cd6e2596d6047b6f9a916f2711b8..6c1ccf5590a3cb3fac1c881b54311aa3e8c4769a 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2467,6 +2467,25 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
 }
 EXPORT_SYMBOL(ceph_osdc_start_request);
 
+/*
+ * Unregister a registered request.  The request is not completed (i.e.
+ * no callbacks or wakeups) - higher layers are supposed to know what
+ * they are canceling.
+ */
+void ceph_osdc_cancel_request(struct ceph_osd_request *req)
+{
+       struct ceph_osd_client *osdc = req->r_osdc;
+
+       mutex_lock(&osdc->request_mutex);
+       if (req->r_linger)
+               __unregister_linger_request(osdc, req);
+       __unregister_request(osdc, req);
+       mutex_unlock(&osdc->request_mutex);
+
+       dout("%s %p tid %llu canceled\n", __func__, req, req->r_tid);
+}
+EXPORT_SYMBOL(ceph_osdc_cancel_request);
+
 /*
  * wait for a request to complete
  */
@@ -2475,18 +2494,18 @@ int ceph_osdc_wait_request(struct ceph_osd_client *osdc,
 {
        int rc;
 
+       dout("%s %p tid %llu\n", __func__, req, req->r_tid);
+
        rc = wait_for_completion_interruptible(&req->r_completion);
        if (rc < 0) {
-               mutex_lock(&osdc->request_mutex);
-               __cancel_request(req);
-               __unregister_request(osdc, req);
-               mutex_unlock(&osdc->request_mutex);
+               dout("%s %p tid %llu interrupted\n", __func__, req, req->r_tid);
+               ceph_osdc_cancel_request(req);
                complete_request(req);
-               dout("wait_request tid %llu canceled/timed out\n", req->r_tid);
                return rc;
        }
 
-       dout("wait_request tid %llu result %d\n", req->r_tid, req->r_result);
+       dout("%s %p tid %llu result %d\n", __func__, req, req->r_tid,
+            req->r_result);
        return req->r_result;
 }
 EXPORT_SYMBOL(ceph_osdc_wait_request);