LU-6068 misc: update old URLs to hpdd.intel.com

[fs/lustre-release.git] / lustre / ofd / ofd_dev.c

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 82bcafc..a210a78 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -695,8 +695,7 @@ static int ofd_procfs_init(struct ofd_device *ofd)
 
        obd->obd_uses_nid_stats = 1;
 
-       entry = lprocfs_seq_register("exports", obd->obd_proc_entry, NULL,
-                                    NULL);
+       entry = lprocfs_register("exports", obd->obd_proc_entry, NULL, NULL);
        if (IS_ERR(entry)) {
                rc = PTR_ERR(entry);
                CERROR("%s: error %d setting up lprocfs for %s\n",
@@ -900,7 +899,6 @@ static int ofd_set_info_hdl(struct tgt_session_info *tsi)
        void                    *key, *val = NULL;
        int                      keylen, vallen, rc = 0;
        bool                     is_grant_shrink;
-       struct ofd_device       *ofd = ofd_exp(tsi->tsi_exp);
 
        ENTRY;
 
@@ -943,8 +941,6 @@ static int ofd_set_info_hdl(struct tgt_session_info *tsi)
                if (vallen > 0)
                        obd_export_evict_by_nid(tsi->tsi_exp->exp_obd, val);
                rc = 0;
-       } else if (KEY_IS(KEY_CAPA_KEY)) {
-               rc = ofd_update_capa_key(ofd, val);
        } else if (KEY_IS(KEY_SPTLRPC_CONF)) {
                rc = tgt_adapt_sptlrpc_conf(tsi->tsi_tgt, 0);
        } else {
@@ -1156,7 +1152,7 @@ static int ofd_get_info_hdl(struct tgt_session_info *tsi)
                                      RCL_CLIENT);
 
        if (KEY_IS(KEY_LAST_ID)) {
-               obd_id          *last_id;
+               u64             *last_id;
                struct ofd_seq  *oseq;
 
                req_capsule_extend(tsi->tsi_pill, &RQF_OST_GET_INFO_LAST_ID);
@@ -1167,7 +1163,7 @@ static int ofd_get_info_hdl(struct tgt_session_info *tsi)
                last_id = req_capsule_server_get(tsi->tsi_pill, &RMF_OBD_ID);
 
                oseq = ofd_seq_load(tsi->tsi_env, ofd,
-                                   (obd_seq)exp->exp_filter_data.fed_group);
+                                   (u64)exp->exp_filter_data.fed_group);
                if (IS_ERR(oseq))
                        rc = -EFAULT;
                else
@@ -1467,10 +1463,10 @@ static int ofd_orphans_destroy(const struct lu_env *env,
        struct lu_fid           *fid    = &info->fti_fid;
        struct ost_id           *oi     = &oa->o_oi;
        struct ofd_seq          *oseq;
-       obd_seq                  seq    = ostid_seq(oi);
-       obd_id                   end_id = ostid_id(oi);
-       obd_id                   last;
-       obd_id                   oid;
+       u64                      seq    = ostid_seq(oi);
+       u64                      end_id = ostid_id(oi);
+       u64                      last;
+       u64                      oid;
        int                      skip_orphan;
        int                      rc     = 0;
 
@@ -1559,8 +1555,8 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
        struct obdo             *rep_oa;
        struct obd_export       *exp = tsi->tsi_exp;
        struct ofd_device       *ofd = ofd_exp(exp);
-       obd_seq                  seq = ostid_seq(&oa->o_oi);
-       obd_id                   oid = ostid_id(&oa->o_oi);
+       u64                      seq = ostid_seq(&oa->o_oi);
+       u64                      oid = ostid_id(&oa->o_oi);
        struct ofd_seq          *oseq;
        int                      rc = 0, diff;
        int                      sync_trans = 0;
@@ -1680,11 +1676,21 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                                       ofd_name(ofd), POSTID(&oa->o_oi));
                                GOTO(out, rc = -EINVAL);
                        }
+
+                       if (diff < 0) {
+                               /* LU-5648 */
+                               CERROR("%s: invalid precreate request for "
+                                      DOSTID", last_id " LPU64 ". "
+                                      "Likely MDS last_id corruption\n",
+                                      ofd_name(ofd), POSTID(&oa->o_oi),
+                                      ofd_seq_last_oid(oseq));
+                               GOTO(out, rc = -EINVAL);
+                       }
                }
        }
        if (diff > 0) {
                cfs_time_t       enough_time = cfs_time_shift(DISK_TIMEOUT);
-               obd_id           next_id;
+               u64              next_id;
                int              created = 0;
                int              count;
 
@@ -1810,8 +1816,8 @@ static int ofd_destroy_hdl(struct tgt_session_info *tsi)
        struct ofd_device       *ofd = ofd_exp(tsi->tsi_exp);
        struct ofd_thread_info  *fti = tsi2ofd_info(tsi);
        struct lu_fid           *fid = &fti->fti_fid;
-       obd_id                   oid;
-       obd_count                count;
+       u64                      oid;
+       u32                      count;
        int                      rc = 0;
 
        ENTRY;
@@ -2115,11 +2121,6 @@ static int ofd_quotactl(struct tgt_session_info *tsi)
        if (repoqc == NULL)
                RETURN(err_serious(-ENOMEM));
 
-       /* report success for quota on/off for interoperability with current MDT
-        * stack */
-       if (oqctl->qc_cmd == Q_QUOTAON || oqctl->qc_cmd == Q_QUOTAOFF)
-               RETURN(0);
-
        *repoqc = *oqctl;
 
        id = repoqc->qc_id;
@@ -2748,12 +2749,6 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        spin_lock_init(&m->ofd_batch_lock);
        init_rwsem(&m->ofd_lastid_rwsem);
 
-       obd->u.filter.fo_fl_oss_capa = 0;
-       INIT_LIST_HEAD(&obd->u.filter.fo_capa_keys);
-       obd->u.filter.fo_capa_hash = init_capa_hash();
-       if (obd->u.filter.fo_capa_hash == NULL)
-               RETURN(-ENOMEM);
-
        m->ofd_dt_dev.dd_lu_dev.ld_ops = &ofd_lu_ops;
        m->ofd_dt_dev.dd_lu_dev.ld_obd = obd;
        /* set this lu_device to obd, because error handling need it */
@@ -2857,7 +2852,7 @@ err_fini_fs:
 err_fini_lut:
        tgt_fini(env, &m->ofd_lut);
 err_free_ns:
-       ldlm_namespace_free(m->ofd_namespace, 0, obd->obd_force);
+       ldlm_namespace_free(m->ofd_namespace, NULL, obd->obd_force);
        obd->obd_namespace = m->ofd_namespace = NULL;
 err_fini_stack:
        ofd_stack_fini(env, m, &m->ofd_osd->dd_lu_dev);
@@ -2893,9 +2888,6 @@ static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
        lfsck_degister(env, m->ofd_osd);
        ofd_fs_cleanup(env, m);
 
-       ofd_free_capa_keys(m);
-       cleanup_capa_hash(obd->u.filter.fo_capa_hash);
-
        if (m->ofd_namespace != NULL) {
                ldlm_namespace_free(m->ofd_namespace, NULL,
                                    d->ld_obd->obd_force);
@@ -3047,7 +3039,7 @@ static void __exit ofd_exit(void)
        class_unregister_type(LUSTRE_OST_NAME);
 }
 
-MODULE_AUTHOR("Whamcloud, Inc. <http://www.whamcloud.com/>");
+MODULE_AUTHOR("Intel Corporation. <https://www.hpdd.intel.com/>");
 MODULE_DESCRIPTION("Lustre Object Filtering Device");
 MODULE_LICENSE("GPL");