LU-3319 procfs: Move NRS TBF proc handling to seq_files

[fs/lustre-release.git] / lustre / osp / osp_dev.c

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index 550ba5e..27e3011 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -45,6 +45,7 @@
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <obd_class.h>
+#include <lustre_ioctl.h>
 #include <lustre_param.h>
 #include <lustre_log.h>
 #include <lustre_mdc.h>
@@ -366,7 +367,7 @@ static int osp_process_config(const struct lu_env *env,
                              struct lu_device *dev, struct lustre_cfg *lcfg)
 {
        struct osp_device               *d = lu2osp_dev(dev);
-       struct lprocfs_static_vars       lvars = { 0 };
+       struct obd_device               *obd = d->opd_obd;
        int                              rc;
 
        ENTRY;
@@ -380,11 +381,9 @@ static int osp_process_config(const struct lu_env *env,
                rc = osp_shutdown(env, d);
                break;
        case LCFG_PARAM:
-               lprocfs_osp_init_vars(&lvars);
-
-               LASSERT(d->opd_obd);
-               rc = class_process_proc_param(PARAM_OSC, lvars.obd_vars,
-                                             lcfg, d->opd_obd);
+               LASSERT(obd);
+               rc = class_process_proc_seq_param(PARAM_OSC, obd->obd_vars,
+                                                 lcfg, obd);
                if (rc > 0)
                        rc = 0;
                if (rc == -ENOSYS) {
@@ -531,8 +530,6 @@ out:
        RETURN(rc);
 }
 
-#define OSP_MAX_AUIF_MAX       512
-
 static int osp_init0(const struct lu_env *env, struct osp_device *m,
                     struct lu_device_type *ldt, struct lustre_cfg *cfg)
 {
@@ -546,8 +543,6 @@ static int osp_init0(const struct lu_env *env, struct osp_device *m,
        ENTRY;
 
        mutex_init(&m->opd_async_requests_mutex);
-       /* We allow OSP_MAX_AUIF_MAX async updates in flight at most. */
-       sema_init(&m->opd_async_fc_sem, OSP_MAX_AUIF_MAX);
 
        obd = class_name2obd(lustre_cfg_string(cfg, 0));
        if (obd == NULL) {
@@ -1161,14 +1156,20 @@ static int osp_obd_get_info(const struct lu_env *env, struct obd_export *exp,
        RETURN(rc);
 }
 
-int osp_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
-                 struct md_op_data *op_data)
+int osp_fid_alloc(const struct lu_env *env, struct obd_export *exp,
+                 struct lu_fid *fid, struct md_op_data *op_data)
 {
-       struct client_obd *cli = &exp->exp_obd->u.cli;
-       struct lu_client_seq *seq = cli->cl_seq;
-
+       struct client_obd       *cli = &exp->exp_obd->u.cli;
+       struct osp_device       *osp = lu2osp_dev(exp->exp_obd->obd_lu_dev);
+       struct lu_client_seq    *seq = cli->cl_seq;
        ENTRY;
-       RETURN(seq_client_alloc_fid(NULL, seq, fid));
+
+       LASSERT(osp->opd_obd->u.cli.cl_seq != NULL);
+       /* Sigh, fid client is not ready yet */
+       if (osp->opd_obd->u.cli.cl_seq->lcs_exp == NULL)
+               RETURN(-ENOTCONN);
+
+       RETURN(seq_client_alloc_fid(env, seq, fid));
 }
 
 /* context key constructor/destructor: mdt_key_init, mdt_key_fini */
@@ -1238,35 +1239,29 @@ struct llog_operations osp_mds_ost_orig_logops;
 
 static int __init osp_mod_init(void)
 {
-       struct lprocfs_static_vars       lvars;
-       cfs_proc_dir_entry_t            *osc_proc_dir;
-       int                              rc;
+       struct obd_type *type;
+       int rc;
 
        rc = lu_kmem_init(osp_caches);
        if (rc)
                return rc;
 
-       lprocfs_osp_init_vars(&lvars);
 
-       rc = class_register_type(&osp_obd_device_ops, NULL, NULL,
+       rc = class_register_type(&osp_obd_device_ops, NULL, true, NULL,
 #ifndef HAVE_ONLY_PROCFS_SEQ
-                               lvars.module_vars,
+                                NULL,
 #endif
-                               LUSTRE_OSP_NAME, &osp_device_type);
-
-       /* create "osc" entry in procfs for compatibility purposes */
+                                LUSTRE_OSP_NAME, &osp_device_type);
        if (rc != 0) {
                lu_kmem_fini(osp_caches);
                return rc;
        }
 
-       lprocfs_lwp_init_vars(&lvars);
-
-       rc = class_register_type(&lwp_obd_device_ops, NULL, NULL,
+       rc = class_register_type(&lwp_obd_device_ops, NULL, true, NULL,
 #ifndef HAVE_ONLY_PROCFS_SEQ
-                               lvars.module_vars,
+                                NULL,
 #endif
-                               LUSTRE_LWP_NAME, &lwp_device_type);
+                                LUSTRE_LWP_NAME, &lwp_device_type);
        if (rc != 0) {
                class_unregister_type(LUSTRE_OSP_NAME);
                lu_kmem_fini(osp_caches);
@@ -1278,21 +1273,24 @@ static int __init osp_mod_init(void)
        osp_mds_ost_orig_logops.lop_add = llog_cat_add_rec;
        osp_mds_ost_orig_logops.lop_declare_add = llog_cat_declare_add_rec;
 
-       osc_proc_dir = lprocfs_srch(proc_lustre_root, "osc");
-       if (osc_proc_dir == NULL) {
-               osc_proc_dir = lprocfs_register("osc", proc_lustre_root, NULL,
-                                               NULL);
-               if (IS_ERR(osc_proc_dir))
-                       CERROR("osp: can't create compat entry \"osc\": %d\n",
-                              (int) PTR_ERR(osc_proc_dir));
+       /* create "osc" entry in procfs for compatibility purposes */
+       type = class_search_type(LUSTRE_OSC_NAME);
+       if (type != NULL && type->typ_procroot != NULL)
+               return rc;
+
+       type = class_search_type(LUSTRE_OSP_NAME);
+       type->typ_procsym = lprocfs_seq_register("osc", proc_lustre_root,
+                                                NULL, NULL);
+       if (IS_ERR(type->typ_procsym)) {
+               CERROR("osp: can't create compat entry \"osc\": %d\n",
+                      (int) PTR_ERR(type->typ_procsym));
+               type->typ_procsym = NULL;
        }
        return rc;
 }
 
 static void __exit osp_mod_exit(void)
 {
-       lprocfs_try_remove_proc_entry("osc", proc_lustre_root);
-
        class_unregister_type(LUSTRE_LWP_NAME);
        class_unregister_type(LUSTRE_OSP_NAME);
        lu_kmem_fini(osp_caches);