void cachefiles_ondemand_clean_object(struct cachefiles_object *object)
 {
+       unsigned long index;
+       struct cachefiles_req *req;
+       struct cachefiles_cache *cache;
+
        if (!object->ondemand)
                return;
 
        cachefiles_ondemand_send_req(object, CACHEFILES_OP_CLOSE, 0,
                        cachefiles_ondemand_init_close_req, NULL);
+
+       if (!object->ondemand->ondemand_id)
+               return;
+
+       /* Cancel all requests for the object that is being dropped. */
+       cache = object->volume->cache;
+       xa_lock(&cache->reqs);
        cachefiles_ondemand_set_object_dropping(object);
+       xa_for_each(&cache->reqs, index, req) {
+               if (req->object == object) {
+                       req->error = -EIO;
+                       complete(&req->done);
+                       __xa_erase(&cache->reqs, index);
+               }
+       }
+       xa_unlock(&cache->reqs);
 }
 
 int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object,