LU-9679 osc: use overlapped() consistently.

[fs/lustre-release.git] / lustre / osc / osc_cache.c

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index f043f89..38a64d1 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -280,6 +280,11 @@ out:
        __res;                                                                 \
 })
 
+static inline bool
+overlapped(const struct osc_extent *ex1, const struct osc_extent *ex2)
+{
+       return !(ex1->oe_end < ex2->oe_start || ex2->oe_end < ex1->oe_start);
+}
 
 /**
  * sanity check - to make sure there is no overlapped extent in the tree.
@@ -297,8 +302,7 @@ static int osc_extent_is_overlapped(struct osc_object *obj,
        for (tmp = first_extent(obj); tmp != NULL; tmp = next_extent(tmp)) {
                if (tmp == ext)
                        continue;
-               if (tmp->oe_end >= ext->oe_start &&
-                   tmp->oe_start <= ext->oe_end)
+               if (overlapped(tmp, ext))
                        return 1;
        }
        return 0;
@@ -611,12 +615,6 @@ int osc_extent_release(const struct lu_env *env, struct osc_extent *ext)
        RETURN(rc);
 }
 
-static inline bool
-overlapped(const struct osc_extent *ex1, const struct osc_extent *ex2)
-{
-       return !(ex1->oe_end < ex2->oe_start || ex2->oe_end < ex1->oe_start);
-}
-
 /**
  * Find or create an extent which includes @index, core function to manage
  * extent tree.
@@ -1880,7 +1878,6 @@ static void osc_ap_completion(const struct lu_env *env, struct client_obd *cli,
        spin_lock(&oap->oap_lock);
        oap->oap_async_flags = 0;
        spin_unlock(&oap->oap_lock);
-       oap->oap_interrupted = 0;
 
        if (oap->oap_cmd & OBD_BRW_WRITE && xid > 0) {
                spin_lock(&cli->cl_loi_list_lock);
@@ -2638,71 +2635,6 @@ out:
        return rc;
 }
 
-/**
- * this is called when a sync waiter receives an interruption.  Its job is to
- * get the caller woken as soon as possible.  If its page hasn't been put in an
- * rpc yet it can dequeue immediately.  Otherwise it has to mark the rpc as
- * desiring interruption which will forcefully complete the rpc once the rpc
- * has timed out.
- */
-int osc_cancel_async_page(const struct lu_env *env, struct osc_page *ops)
-{
-       struct osc_async_page *oap = &ops->ops_oap;
-       struct osc_object     *obj = oap->oap_obj;
-       struct client_obd     *cli = osc_cli(obj);
-       struct osc_extent     *ext;
-       struct osc_extent     *found = NULL;
-       struct list_head            *plist;
-       pgoff_t index = osc_index(ops);
-       int     rc = -EBUSY;
-       int     cmd;
-       ENTRY;
-
-       LASSERT(!oap->oap_interrupted);
-       oap->oap_interrupted = 1;
-
-       /* Find out the caching extent */
-       osc_object_lock(obj);
-       if (oap->oap_cmd & OBD_BRW_WRITE) {
-               plist = &obj->oo_urgent_exts;
-               cmd   = OBD_BRW_WRITE;
-       } else {
-               plist = &obj->oo_reading_exts;
-               cmd   = OBD_BRW_READ;
-       }
-       list_for_each_entry(ext, plist, oe_link) {
-               if (ext->oe_start <= index && ext->oe_end >= index) {
-                       LASSERT(ext->oe_state == OES_LOCK_DONE);
-                       /* For OES_LOCK_DONE state extent, it has already held
-                        * a refcount for RPC. */
-                       found = osc_extent_get(ext);
-                       break;
-               }
-       }
-       if (found != NULL) {
-               list_del_init(&found->oe_link);
-               osc_update_pending(obj, cmd, -found->oe_nr_pages);
-               osc_object_unlock(obj);
-
-               osc_extent_finish(env, found, 0, -EINTR);
-               osc_extent_put(env, found);
-               rc = 0;
-       } else {
-               osc_object_unlock(obj);
-               /* ok, it's been put in an rpc. only one oap gets a request
-                * reference */
-               if (oap->oap_request != NULL) {
-                       ptlrpc_mark_interrupted(oap->oap_request);
-                       ptlrpcd_wake(oap->oap_request);
-                       ptlrpc_req_finished(oap->oap_request);
-                       oap->oap_request = NULL;
-               }
-       }
-
-       osc_list_maint(cli, obj);
-       RETURN(rc);
-}
-
 int osc_queue_sync_pages(const struct lu_env *env, const struct cl_io *io,
                         struct osc_object *obj, struct list_head *list,
                         int brw_flags)