LU-3319 procfs: move FLD proc handling over to seq_file

[fs/lustre-release.git] / lustre / fld / fld_request.c

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index 93d1c1e..8d7539d 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -282,33 +282,32 @@ EXPORT_SYMBOL(fld_client_del_target);
 #ifdef LPROCFS
 static int fld_client_proc_init(struct lu_client_fld *fld)
 {
-        int rc;
-        ENTRY;
-
-        fld->lcf_proc_dir = lprocfs_register(fld->lcf_name,
-                                             fld_type_proc_dir,
-                                             NULL, NULL);
+       int rc;
+       ENTRY;
 
-        if (IS_ERR(fld->lcf_proc_dir)) {
-                CERROR("%s: LProcFS failed in fld-init\n",
-                       fld->lcf_name);
-                rc = PTR_ERR(fld->lcf_proc_dir);
-                RETURN(rc);
-        }
+       fld->lcf_proc_dir = lprocfs_seq_register(fld->lcf_name,
+                                                fld_type_proc_dir,
+                                                NULL, NULL);
+       if (IS_ERR(fld->lcf_proc_dir)) {
+               CERROR("%s: LProcFS failed in fld-init\n",
+                      fld->lcf_name);
+               rc = PTR_ERR(fld->lcf_proc_dir);
+               RETURN(rc);
+       }
 
-        rc = lprocfs_add_vars(fld->lcf_proc_dir,
-                              fld_client_proc_list, fld);
-        if (rc) {
-                CERROR("%s: Can't init FLD proc, rc %d\n",
-                       fld->lcf_name, rc);
-                GOTO(out_cleanup, rc);
-        }
+       rc = lprocfs_seq_add_vars(fld->lcf_proc_dir,
+                                 fld_client_proc_list, fld);
+       if (rc) {
+               CERROR("%s: Can't init FLD proc, rc %d\n",
+                      fld->lcf_name, rc);
+               GOTO(out_cleanup, rc);
+       }
 
-        RETURN(0);
+       RETURN(0);
 
 out_cleanup:
-        fld_client_proc_fini(fld);
-        return rc;
+       fld_client_proc_fini(fld);
+       return rc;
 }
 
 void fld_client_proc_fini(struct lu_client_fld *fld)
@@ -419,55 +418,83 @@ void fld_client_fini(struct lu_client_fld *fld)
 EXPORT_SYMBOL(fld_client_fini);
 
 int fld_client_rpc(struct obd_export *exp,
-                   struct lu_seq_range *range, __u32 fld_op)
+                  struct lu_seq_range *range, __u32 fld_op,
+                  struct ptlrpc_request **reqp)
 {
-       struct ptlrpc_request *req;
+       struct ptlrpc_request *req = NULL;
        struct lu_seq_range   *prange;
        __u32                 *op;
-       int                    rc;
+       int                    rc = 0;
        struct obd_import     *imp;
        ENTRY;
 
        LASSERT(exp != NULL);
 
        imp = class_exp2cliimp(exp);
-       req = ptlrpc_request_alloc_pack(imp, &RQF_FLD_QUERY, LUSTRE_MDS_VERSION,
-                                       FLD_QUERY);
-        if (req == NULL)
-                RETURN(-ENOMEM);
-
-        op = req_capsule_client_get(&req->rq_pill, &RMF_FLD_OPC);
-        *op = fld_op;
+       switch (fld_op) {
+       case FLD_QUERY:
+               req = ptlrpc_request_alloc_pack(imp, &RQF_FLD_QUERY,
+                                               LUSTRE_MDS_VERSION, FLD_QUERY);
+               if (req == NULL)
+                       RETURN(-ENOMEM);
+
+               /* XXX: only needed when talking to old server(< 2.6), it should
+                * be removed when < 2.6 server is not supported */
+               op = req_capsule_client_get(&req->rq_pill, &RMF_FLD_OPC);
+               *op = FLD_LOOKUP;
+
+               if (imp->imp_connect_flags_orig & OBD_CONNECT_MDS_MDS)
+                       req->rq_allow_replay = 1;
+               break;
+       case FLD_READ:
+               req = ptlrpc_request_alloc_pack(imp, &RQF_FLD_READ,
+                                               LUSTRE_MDS_VERSION, FLD_READ);
+               if (req == NULL)
+                       RETURN(-ENOMEM);
+
+               req_capsule_set_size(&req->rq_pill, &RMF_GENERIC_DATA,
+                                    RCL_SERVER, PAGE_CACHE_SIZE);
+               break;
+       default:
+               rc = -EINVAL;
+               break;
+       }
 
-        prange = req_capsule_client_get(&req->rq_pill, &RMF_FLD_MDFLD);
-        *prange = *range;
+       if (rc != 0)
+               RETURN(rc);
 
-        ptlrpc_request_set_replen(req);
+       prange = req_capsule_client_get(&req->rq_pill, &RMF_FLD_MDFLD);
+       *prange = *range;
+       ptlrpc_request_set_replen(req);
         req->rq_request_portal = FLD_REQUEST_PORTAL;
+       req->rq_reply_portal = MDC_REPLY_PORTAL;
         ptlrpc_at_set_req_timeout(req);
 
-       if (fld_op == FLD_LOOKUP &&
-           imp->imp_connect_flags_orig & OBD_CONNECT_MDS_MDS)
-               req->rq_allow_replay = 1;
-
-        if (fld_op != FLD_LOOKUP)
-                mdc_get_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
-        fld_enter_request(&exp->exp_obd->u.cli);
-        rc = ptlrpc_queue_wait(req);
-        fld_exit_request(&exp->exp_obd->u.cli);
-        if (fld_op != FLD_LOOKUP)
-                mdc_put_rpc_lock(exp->exp_obd->u.cli.cl_rpc_lock, NULL);
-        if (rc)
-                GOTO(out_req, rc);
+       fld_enter_request(&exp->exp_obd->u.cli);
+       rc = ptlrpc_queue_wait(req);
+       fld_exit_request(&exp->exp_obd->u.cli);
+       if (rc)
+               GOTO(out_req, rc);
+
+       if (fld_op == FLD_QUERY) {
+               prange = req_capsule_server_get(&req->rq_pill,
+                                               &RMF_FLD_MDFLD);
+               if (prange == NULL)
+                       GOTO(out_req, rc = -EFAULT);
+               *range = *prange;
+       }
 
-        prange = req_capsule_server_get(&req->rq_pill, &RMF_FLD_MDFLD);
-        if (prange == NULL)
-                GOTO(out_req, rc = -EFAULT);
-        *range = *prange;
-        EXIT;
+       EXIT;
 out_req:
-        ptlrpc_req_finished(req);
-        return rc;
+       if (rc != 0 || reqp == NULL) {
+               ptlrpc_req_finished(req);
+               req = NULL;
+       }
+
+       if (reqp != NULL)
+               *reqp = req;
+
+       return rc;
 }
 
 int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds,
@@ -504,7 +531,7 @@ int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds,
        } else
 #endif
        {
-               rc = fld_client_rpc(target->ft_exp, &res, FLD_LOOKUP);
+               rc = fld_client_rpc(target->ft_exp, &res, FLD_QUERY, NULL);
        }
 
        if (rc == 0) {
@@ -528,9 +555,9 @@ struct proc_dir_entry *fld_type_proc_dir;
 
 static int __init fld_mod_init(void)
 {
-       fld_type_proc_dir = lprocfs_register(LUSTRE_FLD_NAME,
-                                            proc_lustre_root,
-                                            NULL, NULL);
+       fld_type_proc_dir = lprocfs_seq_register(LUSTRE_FLD_NAME,
+                                                proc_lustre_root,
+                                                NULL, NULL);
        if (IS_ERR(fld_type_proc_dir))
                return PTR_ERR(fld_type_proc_dir);