LU-5823 clio: add coo_obd_info_get and coo_data_version

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

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 7ed4225..2bcc035 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -68,10 +68,6 @@ struct osc_brw_async_args {
 
 #define osc_grant_args osc_brw_async_args
 
-struct osc_async_args {
-       struct obd_info *aa_oi;
-};
-
 struct osc_setattr_args {
        struct obdo             *sa_oa;
        obd_enqueue_update_f     sa_upcall;
@@ -116,8 +112,7 @@ static inline void osc_pack_capa(struct ptlrpc_request *req,
         DEBUG_CAPA(D_SEC, c, "pack");
 }
 
-static inline void osc_pack_req_body(struct ptlrpc_request *req,
-                                     struct obd_info *oinfo)
+void osc_pack_req_body(struct ptlrpc_request *req, struct obd_info *oinfo)
 {
        struct ost_body *body;
 
@@ -129,9 +124,9 @@ static inline void osc_pack_req_body(struct ptlrpc_request *req,
        osc_pack_capa(req, body, oinfo->oi_capa);
 }
 
-static inline void osc_set_capa_size(struct ptlrpc_request *req,
-                                     const struct req_msg_field *field,
-                                     struct obd_capa *oc)
+void osc_set_capa_size(struct ptlrpc_request *req,
+                      const struct req_msg_field *field,
+                      struct obd_capa *oc)
 {
         if (oc == NULL)
                 req_capsule_set_size(&req->rq_pill, field, RCL_CLIENT, 0);
@@ -140,9 +135,9 @@ static inline void osc_set_capa_size(struct ptlrpc_request *req,
                 ;
 }
 
-static int osc_getattr_interpret(const struct lu_env *env,
-                                 struct ptlrpc_request *req,
-                                 struct osc_async_args *aa, int rc)
+int osc_getattr_interpret(const struct lu_env *env,
+                         struct ptlrpc_request *req,
+                         struct osc_async_args *aa, int rc)
 {
         struct ost_body *body;
         ENTRY;
@@ -2506,101 +2501,6 @@ out:
        return err;
 }
 
-static int osc_get_info(const struct lu_env *env, struct obd_export *exp,
-                        obd_count keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm)
-{
-        ENTRY;
-        if (!vallen || !val)
-                RETURN(-EFAULT);
-
-       if (KEY_IS(KEY_FIEMAP)) {
-               struct ll_fiemap_info_key *fm_key =
-                               (struct ll_fiemap_info_key *)key;
-               struct ldlm_res_id       res_id;
-               ldlm_policy_data_t       policy;
-               struct lustre_handle     lockh;
-               ldlm_mode_t              mode = 0;
-               struct ptlrpc_request   *req;
-               struct ll_user_fiemap   *reply;
-               char                    *tmp;
-               int                      rc;
-
-               if (!(fm_key->fiemap.fm_flags & FIEMAP_FLAG_SYNC))
-                       goto skip_locking;
-
-               policy.l_extent.start = fm_key->fiemap.fm_start &
-                                               CFS_PAGE_MASK;
-
-               if (OBD_OBJECT_EOF - fm_key->fiemap.fm_length <=
-                   fm_key->fiemap.fm_start + PAGE_CACHE_SIZE - 1)
-                       policy.l_extent.end = OBD_OBJECT_EOF;
-               else
-                       policy.l_extent.end = (fm_key->fiemap.fm_start +
-                               fm_key->fiemap.fm_length +
-                               PAGE_CACHE_SIZE - 1) & CFS_PAGE_MASK;
-
-               ostid_build_res_name(&fm_key->oa.o_oi, &res_id);
-               mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
-                                      LDLM_FL_BLOCK_GRANTED |
-                                      LDLM_FL_LVB_READY,
-                                      &res_id, LDLM_EXTENT, &policy,
-                                      LCK_PR | LCK_PW, &lockh, 0);
-               if (mode) { /* lock is cached on client */
-                       if (mode != LCK_PR) {
-                               ldlm_lock_addref(&lockh, LCK_PR);
-                               ldlm_lock_decref(&lockh, LCK_PW);
-                       }
-               } else { /* no cached lock, needs acquire lock on server side */
-                       fm_key->oa.o_valid |= OBD_MD_FLFLAGS;
-                       fm_key->oa.o_flags |= OBD_FL_SRVLOCK;
-               }
-
-skip_locking:
-                req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                           &RQF_OST_GET_INFO_FIEMAP);
-                if (req == NULL)
-                       GOTO(drop_lock, rc = -ENOMEM);
-
-                req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_KEY,
-                                     RCL_CLIENT, keylen);
-                req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_VAL,
-                                     RCL_CLIENT, *vallen);
-                req_capsule_set_size(&req->rq_pill, &RMF_FIEMAP_VAL,
-                                     RCL_SERVER, *vallen);
-
-                rc = ptlrpc_request_pack(req, LUSTRE_OST_VERSION, OST_GET_INFO);
-                if (rc) {
-                        ptlrpc_request_free(req);
-                       GOTO(drop_lock, rc);
-                }
-
-                tmp = req_capsule_client_get(&req->rq_pill, &RMF_FIEMAP_KEY);
-                memcpy(tmp, key, keylen);
-                tmp = req_capsule_client_get(&req->rq_pill, &RMF_FIEMAP_VAL);
-                memcpy(tmp, val, *vallen);
-
-                ptlrpc_request_set_replen(req);
-                rc = ptlrpc_queue_wait(req);
-                if (rc)
-                       GOTO(fini_req, rc);
-
-                reply = req_capsule_server_get(&req->rq_pill, &RMF_FIEMAP_VAL);
-                if (reply == NULL)
-                       GOTO(fini_req, rc = -EPROTO);
-
-                memcpy(val, reply, *vallen);
-fini_req:
-                ptlrpc_req_finished(req);
-drop_lock:
-               if (mode)
-                       ldlm_lock_decref(&lockh, LCK_PR);
-                RETURN(rc);
-        }
-
-        RETURN(-EINVAL);
-}
-
 static int osc_set_info_async(const struct lu_env *env, struct obd_export *exp,
                               obd_count keylen, void *key, obd_count vallen,
                               void *val, struct ptlrpc_request_set *set)
@@ -3073,7 +2973,6 @@ static struct obd_ops osc_obd_ops = {
         .o_setattr              = osc_setattr,
         .o_setattr_async        = osc_setattr_async,
         .o_iocontrol            = osc_iocontrol,
-        .o_get_info             = osc_get_info,
         .o_set_info_async       = osc_set_info_async,
         .o_import_event         = osc_import_event,
         .o_process_config       = osc_process_config,