Whamcloud - gitweb
LU-4621 ofd: create same count of objects
[fs/lustre-release.git] / lustre / ofd / ofd_dev.c
index 21b124c..774ec02 100644 (file)
@@ -81,7 +81,7 @@ static int ofd_connect_to_next(const struct lu_env *env, struct ofd_device *m,
        obd = class_name2obd(next);
        if (obd == NULL) {
                CERROR("%s: can't locate next device: %s\n",
-                      m->ofd_dt_dev.dd_lu_dev.ld_obd->obd_name, next);
+                      ofd_name(m), next);
                GOTO(out, rc = -ENOTCONN);
        }
 
@@ -91,7 +91,7 @@ static int ofd_connect_to_next(const struct lu_env *env, struct ofd_device *m,
        rc = obd_connect(NULL, exp, obd, &obd->obd_uuid, data, NULL);
        if (rc) {
                CERROR("%s: cannot connect to next dev %s: rc = %d\n",
-                      m->ofd_dt_dev.dd_lu_dev.ld_obd->obd_name, next, rc);
+                      ofd_name(m), next, rc);
                GOTO(out, rc);
        }
 
@@ -182,7 +182,6 @@ static void ofd_stack_fini(const struct lu_env *env, struct ofd_device *m,
 
        LASSERT(m->ofd_osd_exp);
        obd_disconnect(m->ofd_osd_exp);
-       m->ofd_osd = NULL;
 
        EXIT;
 }
@@ -240,8 +239,7 @@ static int ofd_process_config(const struct lu_env *env, struct lu_device *d,
 
        switch (cfg->lcfg_command) {
        case LCFG_PARAM: {
-               struct lprocfs_static_vars lvars;
-
+               struct obd_device       *obd = ofd_obd(m);
                /* For interoperability */
                struct cfg_interop_param   *ptr = NULL;
                struct lustre_cfg          *old_cfg = NULL;
@@ -279,8 +277,7 @@ static int ofd_process_config(const struct lu_env *env, struct lu_device *d,
                        break;
                }
 
-               lprocfs_ofd_init_vars(&lvars);
-               rc = class_process_proc_param(PARAM_OST, lvars.obd_vars, cfg,
+               rc = class_process_proc_seq_param(PARAM_OST, obd->obd_vars, cfg,
                                              d->ld_obd);
                if (rc > 0 || rc == -ENOSYS) {
                        CDEBUG(D_CONFIG, "pass param %s down the stack.\n",
@@ -362,7 +359,7 @@ static struct lu_object *ofd_object_alloc(const struct lu_env *env,
 
        ENTRY;
 
-       OBD_SLAB_ALLOC_PTR_GFP(of, ofd_object_kmem, __GFP_IO);
+       OBD_SLAB_ALLOC_PTR_GFP(of, ofd_object_kmem, GFP_NOFS);
        if (of != NULL) {
                struct lu_object        *o;
                struct lu_object_header *h;
@@ -381,6 +378,38 @@ static struct lu_object *ofd_object_alloc(const struct lu_env *env,
 
 extern int ost_handle(struct ptlrpc_request *req);
 
+static int ofd_lfsck_out_notify(const struct lu_env *env, void *data,
+                               enum lfsck_events event)
+{
+       struct ofd_device *ofd = data;
+       struct obd_device *obd = ofd_obd(ofd);
+
+       switch (event) {
+       case LE_LASTID_REBUILDING:
+               CWARN("%s: Found crashed LAST_ID, deny creating new OST-object "
+                     "on the device until the LAST_ID rebuilt successfully.\n",
+                     obd->obd_name);
+               down_write(&ofd->ofd_lastid_rwsem);
+               ofd->ofd_lastid_rebuilding = 1;
+               up_write(&ofd->ofd_lastid_rwsem);
+               break;
+       case LE_LASTID_REBUILT: {
+               down_write(&ofd->ofd_lastid_rwsem);
+               ofd_seqs_free(env, ofd);
+               ofd->ofd_lastid_rebuilding = 0;
+               ofd->ofd_lastid_gen++;
+               up_write(&ofd->ofd_lastid_rwsem);
+               break;
+       }
+       default:
+               CERROR("%s: unknown lfsck event: rc = %d\n",
+                      ofd_name(ofd), event);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static int ofd_prepare(const struct lu_env *env, struct lu_device *pdev,
                       struct lu_device *dev)
 {
@@ -388,17 +417,10 @@ static int ofd_prepare(const struct lu_env *env, struct lu_device *pdev,
        struct ofd_device               *ofd = ofd_dev(dev);
        struct obd_device               *obd = ofd_obd(ofd);
        struct lu_device                *next = &ofd->ofd_osd->dd_lu_dev;
-       struct lfsck_start_param         lsp;
        int                              rc;
 
        ENTRY;
 
-       rc = lu_env_refill((struct lu_env *)env);
-       if (rc != 0) {
-               CERROR("Failure to refill session: '%d'\n", rc);
-               RETURN(rc);
-       }
-
        info = ofd_info_init(env, NULL);
        if (info == NULL)
                RETURN(-EFAULT);
@@ -408,21 +430,18 @@ static int ofd_prepare(const struct lu_env *env, struct lu_device *pdev,
        if (rc != 0)
                RETURN(rc);
 
-       rc = lfsck_register(env, ofd->ofd_osd, &ofd->ofd_dt_dev, false);
+       rc = lfsck_register(env, ofd->ofd_osd, ofd->ofd_osd, obd,
+                           ofd_lfsck_out_notify, ofd, false);
        if (rc != 0) {
                CERROR("%s: failed to initialize lfsck: rc = %d\n",
                       obd->obd_name, rc);
                RETURN(rc);
        }
 
-       lsp.lsp_start = NULL;
-       lsp.lsp_namespace = ofd->ofd_namespace;
-       rc = lfsck_start(env, ofd->ofd_osd, &lsp);
-       if (rc != 0) {
-               CWARN("%s: auto trigger paused LFSCK failed: rc = %d\n",
-                     obd->obd_name, rc);
-               rc = 0;
-       }
+       rc = lfsck_register_namespace(env, ofd->ofd_osd, ofd->ofd_namespace);
+       /* The LFSCK instance is registered just now, so it must be there when
+        * register the namespace to such instance. */
+       LASSERTF(rc == 0, "register namespace failed: rc = %d\n", rc);
 
        target_recovery_init(&ofd->ofd_lut, tgt_request_handle);
        LASSERT(obd->obd_no_conn);
@@ -464,9 +483,10 @@ static struct lu_device_operations ofd_lu_ops = {
        .ldo_prepare            = ofd_prepare,
 };
 
+LPROC_SEQ_FOPS(lprocfs_nid_stats_clear);
+
 static int ofd_procfs_init(struct ofd_device *ofd)
 {
-       struct lprocfs_static_vars       lvars;
        struct obd_device               *obd = ofd_obd(ofd);
        cfs_proc_dir_entry_t            *entry;
        int                              rc = 0;
@@ -475,8 +495,8 @@ static int ofd_procfs_init(struct ofd_device *ofd)
 
        /* lprocfs must be setup before the ofd so state can be safely added
         * to /proc incrementally as the ofd is setup */
-       lprocfs_ofd_init_vars(&lvars);
-       rc = lprocfs_obd_setup(obd, lvars.obd_vars);
+       obd->obd_vars = lprocfs_ofd_obd_vars;
+       rc = lprocfs_seq_obd_setup(obd);
        if (rc) {
                CERROR("%s: lprocfs_obd_setup failed: %d.\n",
                       obd->obd_name, rc);
@@ -492,7 +512,8 @@ static int ofd_procfs_init(struct ofd_device *ofd)
 
        obd->obd_uses_nid_stats = 1;
 
-       entry = lprocfs_register("exports", obd->obd_proc_entry, NULL, NULL);
+       entry = lprocfs_seq_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",
@@ -502,8 +523,10 @@ static int ofd_procfs_init(struct ofd_device *ofd)
        obd->obd_proc_exports_entry = entry;
 
        entry = lprocfs_add_simple(obd->obd_proc_exports_entry, "clear",
-                                  lprocfs_nid_stats_clear_read,
-                                  lprocfs_nid_stats_clear_write, obd, NULL);
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                                  NULL, NULL,
+#endif
+                                  obd, &lprocfs_nid_stats_clear_fops);
        if (IS_ERR(entry)) {
                rc = PTR_ERR(entry);
                CERROR("%s: add proc entry 'clear' failed: %d.\n",
@@ -516,10 +539,8 @@ static int ofd_procfs_init(struct ofd_device *ofd)
        rc = lprocfs_job_stats_init(obd, LPROC_OFD_STATS_LAST,
                                    ofd_stats_counter_init);
        if (rc)
-               GOTO(remove_entry_clear, rc);
+               GOTO(obd_cleanup, rc);
        RETURN(0);
-remove_entry_clear:
-       lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
 obd_cleanup:
        lprocfs_obd_cleanup(obd);
        lprocfs_free_obd_stats(obd);
@@ -527,51 +548,46 @@ obd_cleanup:
        return rc;
 }
 
+/**
+ * ofd_procfs_add_brw_stats_symlink - expose osd stats to ofd layer
+ *
+ * The osd interfaces to the backend file system exposes useful data
+ * such as brw_stats and read or write cache states. This same data
+ * needs to be exposed into the obdfilter (ofd) layer to maintain
+ * backwards compatibility. This function creates the symlinks in the
+ * proc layer to enable this.
+ */
 static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
 {
        struct obd_device       *obd = ofd_obd(ofd);
        struct obd_device       *osd_obd = ofd->ofd_osd_exp->exp_obd;
-       cfs_proc_dir_entry_t    *osd_root = osd_obd->obd_type->typ_procroot;
-       cfs_proc_dir_entry_t    *osd_dir;
 
-       osd_dir = lprocfs_srch(osd_root, obd->obd_name);
-       if (osd_dir == NULL)
+       if (obd->obd_proc_entry == NULL)
                return;
 
-       if (lprocfs_srch(osd_dir, "brw_stats") != NULL)
-               lprocfs_add_symlink("brw_stats", obd->obd_proc_entry,
-                                   "../../%s/%s/brw_stats",
-                                   osd_root->name, osd_dir->name);
-
-       if (lprocfs_srch(osd_dir, "read_cache_enable") != NULL)
-               lprocfs_add_symlink("read_cache_enable", obd->obd_proc_entry,
-                                   "../../%s/%s/read_cache_enable",
-                                   osd_root->name, osd_dir->name);
-
-       if (lprocfs_srch(osd_dir, "readcache_max_filesize") != NULL)
-               lprocfs_add_symlink("readcache_max_filesize",
-                                   obd->obd_proc_entry,
-                                   "../../%s/%s/readcache_max_filesize",
-                                   osd_root->name, osd_dir->name);
-
-       if (lprocfs_srch(osd_dir, "writethrough_cache_enable") != NULL)
-               lprocfs_add_symlink("writethrough_cache_enable",
-                                   obd->obd_proc_entry,
-                                   "../../%s/%s/writethrough_cache_enable",
-                                   osd_root->name, osd_dir->name);
+       lprocfs_add_symlink("brw_stats", obd->obd_proc_entry,
+                           "../../%s/%s/brw_stats",
+                           osd_obd->obd_type->typ_name, obd->obd_name);
+
+       lprocfs_add_symlink("read_cache_enable", obd->obd_proc_entry,
+                           "../../%s/%s/read_cache_enable",
+                           osd_obd->obd_type->typ_name, obd->obd_name);
+
+       lprocfs_add_symlink("readcache_max_filesize",
+                           obd->obd_proc_entry,
+                           "../../%s/%s/readcache_max_filesize",
+                           osd_obd->obd_type->typ_name, obd->obd_name);
+
+       lprocfs_add_symlink("writethrough_cache_enable",
+                           obd->obd_proc_entry,
+                           "../../%s/%s/writethrough_cache_enable",
+                           osd_obd->obd_type->typ_name, obd->obd_name);
 }
 
 static void ofd_procfs_fini(struct ofd_device *ofd)
 {
        struct obd_device *obd = ofd_obd(ofd);
 
-       lprocfs_remove_proc_entry("writethrough_cache_enable",
-                                 obd->obd_proc_entry);
-       lprocfs_remove_proc_entry("readcache_max_filesize",
-                                 obd->obd_proc_entry);
-       lprocfs_remove_proc_entry("read_cache_enable", obd->obd_proc_entry);
-       lprocfs_remove_proc_entry("brw_stats", obd->obd_proc_entry);
-       lprocfs_remove_proc_entry("clear", obd->obd_proc_exports_entry);
        lprocfs_free_per_client_stats(obd);
        lprocfs_obd_cleanup(obd);
        lprocfs_free_obd_stats(obd);
@@ -721,8 +737,8 @@ int ofd_set_info_hdl(struct tgt_session_info *tsi)
        RETURN(rc);
 }
 
-static int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd,
-                         struct lu_fid *fid, struct ll_user_fiemap *fiemap)
+int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd,
+                  struct lu_fid *fid, struct ll_user_fiemap *fiemap)
 {
        struct ofd_object       *fo;
        int                      rc;
@@ -863,7 +879,7 @@ int ofd_get_info_hdl(struct tgt_session_info *tsi)
        } else if (KEY_IS(KEY_FIEMAP)) {
                struct ll_fiemap_info_key       *fm_key;
                struct ll_user_fiemap           *fiemap;
-               struct lu_fid                   *fid = &fti->fti_fid;
+               struct lu_fid                   *fid;
 
                req_capsule_extend(tsi->tsi_pill, &RQF_OST_GET_INFO_FIEMAP);
 
@@ -872,7 +888,7 @@ int ofd_get_info_hdl(struct tgt_session_info *tsi)
                if (rc)
                        RETURN(err_serious(rc));
 
-               *fid = fm_key->oa.o_oi.oi_fid;
+               fid = &fm_key->oa.o_oi.oi_fid;
 
                CDEBUG(D_INODE, "get FIEMAP of object "DFID"\n", PFID(fid));
 
@@ -1101,7 +1117,7 @@ out:
                 * to go... deadlock! */
                res = ldlm_resource_get(ofd->ofd_namespace, NULL,
                                        &tsi->tsi_resid, LDLM_EXTENT, 0);
-               if (res != NULL) {
+               if (!IS_ERR(res)) {
                        ldlm_res_lvbo_update(res, NULL, 0);
                        ldlm_resource_putref(res);
                }
@@ -1109,12 +1125,95 @@ out:
        return rc;
 }
 
+static int ofd_orphans_destroy(const struct lu_env *env,
+                              struct obd_export *exp,
+                              struct ofd_device *ofd, struct obdo *oa)
+{
+       struct ofd_thread_info  *info   = ofd_info(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;
+       int                      skip_orphan;
+       int                      rc     = 0;
+
+       ENTRY;
+
+       oseq = ofd_seq_get(ofd, seq);
+       if (oseq == NULL) {
+               CERROR("%s: Can not find seq for "DOSTID"\n",
+                      ofd_name(ofd), POSTID(oi));
+               RETURN(-EINVAL);
+       }
+
+       *fid = oi->oi_fid;
+       last = ofd_seq_last_oid(oseq);
+       oid = last;
+
+       LASSERT(exp != NULL);
+       skip_orphan = !!(exp_connect_flags(exp) & OBD_CONNECT_SKIP_ORPHAN);
+
+       if (OBD_FAIL_CHECK(OBD_FAIL_OST_NODESTROY))
+               goto done;
+
+       LCONSOLE(D_INFO, "%s: deleting orphan objects from "DOSTID
+                " to "DOSTID"\n", ofd_name(ofd), seq, end_id + 1, seq, last);
+
+       while (oid > end_id) {
+               rc = fid_set_id(fid, oid);
+               if (unlikely(rc != 0))
+                       GOTO(out_put, rc);
+
+               rc = ofd_destroy_by_fid(env, ofd, fid, 1);
+               if (rc != 0 && rc != -ENOENT && rc != -ESTALE &&
+                   likely(rc != -EREMCHG && rc != -EINPROGRESS))
+                       /* this is pretty fatal... */
+                       CEMERG("%s: error destroying precreated id "
+                              DFID": rc = %d\n",
+                              ofd_name(ofd), PFID(fid), rc);
+
+               oid--;
+               if (!skip_orphan) {
+                       ofd_seq_last_oid_set(oseq, oid);
+                       /* update last_id on disk periodically so that if we
+                        * restart * we don't need to re-scan all of the just
+                        * deleted objects. */
+                       if ((oid & 511) == 0)
+                               ofd_seq_last_oid_write(env, ofd, oseq);
+               }
+       }
+
+       CDEBUG(D_HA, "%s: after destroy: set last_id to "DOSTID"\n",
+              ofd_name(ofd), seq, oid);
+
+done:
+       if (!skip_orphan) {
+               ofd_seq_last_oid_set(oseq, oid);
+               rc = ofd_seq_last_oid_write(env, ofd, oseq);
+       } else {
+               /* don't reuse orphan object, return last used objid */
+               ostid_set_id(oi, last);
+               rc = 0;
+       }
+
+       GOTO(out_put, rc);
+
+out_put:
+       ofd_seq_put(env, oseq);
+       return rc;
+}
+
 static int ofd_create_hdl(struct tgt_session_info *tsi)
 {
+       struct ptlrpc_request   *req = tgt_ses_req(tsi);
        struct ost_body         *repbody;
        const struct obdo       *oa = &tsi->tsi_ost_body->oa;
        struct obdo             *rep_oa;
-       struct ofd_device       *ofd = ofd_exp(tsi->tsi_exp);
+       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);
        struct ofd_seq          *oseq;
@@ -1130,6 +1229,13 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
        if (repbody == NULL)
                RETURN(-ENOMEM);
 
+       down_read(&ofd->ofd_lastid_rwsem);
+       /* Currently, for safe, we do not distinguish which LAST_ID is broken,
+        * we may do that in the future.
+        * Return -ENOSPC until the LAST_ID rebuilt. */
+       if (unlikely(ofd->ofd_lastid_rebuilding))
+               GOTO(out_sem, rc = -ENOSPC);
+
        rep_oa = &repbody->oa;
        rep_oa->o_oi = oa->o_oi;
 
@@ -1142,7 +1248,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
        if (IS_ERR(oseq)) {
                CERROR("%s: Can't find FID Sequence "LPX64": rc = %ld\n",
                       ofd_name(ofd), seq, PTR_ERR(oseq));
-               RETURN(-EINVAL);
+               GOTO(out_sem, rc = -EINVAL);
        }
 
        if ((oa->o_valid & OBD_MD_FLFLAGS) &&
@@ -1161,9 +1267,11 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
        /* former ofd_handle_precreate */
        if ((oa->o_valid & OBD_MD_FLFLAGS) &&
            (oa->o_flags & OBD_FL_DELORPHAN)) {
+               exp->exp_filter_data.fed_lastid_gen = ofd->ofd_lastid_gen;
+
                /* destroy orphans */
                if (lustre_msg_get_conn_cnt(tgt_ses_req(tsi)->rq_reqmsg) <
-                   tsi->tsi_exp->exp_conn_cnt) {
+                   exp->exp_conn_cnt) {
                        CERROR("%s: dropping old orphan cleanup request\n",
                               ofd_name(ofd));
                        GOTO(out_nolock, rc = 0);
@@ -1184,7 +1292,7 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                        /* FIXME: should reset precreate_next_id on MDS */
                        rc = 0;
                } else if (diff < 0) {
-                       rc = ofd_orphans_destroy(tsi->tsi_env, tsi->tsi_exp,
+                       rc = ofd_orphans_destroy(tsi->tsi_env, exp,
                                                 ofd, rep_oa);
                        oseq->os_destroys_in_progress = 0;
                } else {
@@ -1192,9 +1300,15 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                        oseq->os_destroys_in_progress = 0;
                }
        } else {
+               if (unlikely(exp->exp_filter_data.fed_lastid_gen !=
+                            ofd->ofd_lastid_gen)) {
+                       ofd_obd_disconnect(exp);
+                       GOTO(out_nolock, rc = -ENOTCONN);
+               }
+
                mutex_lock(&oseq->os_create_lock);
                if (lustre_msg_get_conn_cnt(tgt_ses_req(tsi)->rq_reqmsg) <
-                   tsi->tsi_exp->exp_conn_cnt) {
+                   exp->exp_conn_cnt) {
                        CERROR("%s: dropping old precreate request\n",
                               ofd_name(ofd));
                        GOTO(out, rc = 0);
@@ -1265,12 +1379,12 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                               " at "LPU64"\n", ofd_name(ofd),
                               count, seq, next_id);
 
-                       if (cfs_time_after(jiffies, enough_time)) {
-                               LCONSOLE_WARN("%s: Slow creates, %d/%d objects"
-                                             " created at a rate of %d/s\n",
-                                             ofd_name(ofd), created,
-                                             diff + created,
-                                             created / DISK_TIMEOUT);
+                       if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
+                           && cfs_time_after(jiffies, enough_time)) {
+                               CDEBUG(D_HA, "%s: Slow creates, %d/%d objects"
+                                     " created at a rate of %d/s\n",
+                                     ofd_name(ofd), created, diff + created,
+                                     created / DISK_TIMEOUT);
                                break;
                        }
 
@@ -1283,6 +1397,14 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                                break;
                        }
                }
+
+               if (diff > 0 &&
+                   lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
+                       LCONSOLE_WARN("%s: can't create the same count of"
+                                     " objects when replaying the request"
+                                     " (diff is %d). see LU-4621\n",
+                                     ofd_name(ofd), diff);
+
                if (created > 0)
                        /* some objects got created, we can return
                         * them, even if last creation failed */
@@ -1299,15 +1421,27 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
                ostid_set_id(&rep_oa->o_oi, ofd_seq_last_oid(oseq));
        }
        EXIT;
-       ofd_counter_incr(tsi->tsi_exp, LPROC_OFD_STATS_CREATE,
+       ofd_counter_incr(exp, LPROC_OFD_STATS_CREATE,
                         tsi->tsi_jobid, 1);
 out:
        mutex_unlock(&oseq->os_create_lock);
 out_nolock:
-       if (rc == 0)
+       if (rc == 0) {
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 8, 53, 0)
+               struct ofd_thread_info  *info = ofd_info(tsi->tsi_env);
+               struct lu_fid           *fid = &info->fti_fid;
+
+               /* For compatible purpose, it needs to convert back to
+                * OST ID before put it on wire. */
+               *fid = rep_oa->o_oi.oi_fid;
+               fid_to_ostid(fid, &rep_oa->o_oi);
+#endif
                rep_oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
-
+       }
        ofd_seq_put(tsi->tsi_env, oseq);
+
+out_sem:
+       up_read(&ofd->ofd_lastid_rwsem);
        return rc;
 }
 
@@ -1433,7 +1567,8 @@ static int ofd_sync_hdl(struct tgt_session_info *tsi)
        }
 
        rc = tgt_sync(tsi->tsi_env, tsi->tsi_tgt,
-                     fo != NULL ? ofd_object_child(fo) : NULL);
+                     fo != NULL ? ofd_object_child(fo) : NULL,
+                     repbody->oa.o_size, repbody->oa.o_blocks);
        if (rc)
                GOTO(put, rc);
 
@@ -1532,7 +1667,7 @@ static int ofd_punch_hdl(struct tgt_session_info *tsi)
        }
 
        rc = ofd_object_punch(tsi->tsi_env, fo, start, end, &info->fti_attr,
-                             ff);
+                             ff, (struct obdo *)oa);
        if (rc)
                GOTO(out_put, rc);
 
@@ -1552,7 +1687,7 @@ out:
                 * to go... deadlock! */
                res = ldlm_resource_get(ns, NULL, &tsi->tsi_resid,
                                        LDLM_EXTENT, 0);
-               if (res != NULL) {
+               if (!IS_ERR(res)) {
                        ldlm_res_lvbo_update(res, NULL, 0);
                        ldlm_resource_putref(res);
                }
@@ -1939,8 +2074,8 @@ static struct tgt_opc_slice ofd_common_slice[] = {
                .tos_hs         = tgt_dlm_handlers
        },
        {
-               .tos_opc_start  = UPDATE_OBJ,
-               .tos_opc_end    = UPDATE_LAST_OPC,
+               .tos_opc_start  = OUT_UPDATE_FIRST_OPC,
+               .tos_opc_end    = OUT_UPDATE_LAST_OPC,
                .tos_hs         = tgt_out_handlers
        },
        {
@@ -1949,6 +2084,11 @@ static struct tgt_opc_slice ofd_common_slice[] = {
                .tos_hs         = seq_handlers
        },
        {
+               .tos_opc_start  = LFSCK_FIRST_OPC,
+               .tos_opc_end    = LFSCK_LAST_OPC,
+               .tos_hs         = tgt_lfsck_handlers
+       },
+       {
                .tos_hs         = NULL
        }
 };
@@ -1999,10 +2139,12 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        m->ofd_tot_granted = 0;
        m->ofd_tot_pending = 0;
        m->ofd_seq_count = 0;
+       init_waitqueue_head(&m->ofd_inconsistency_thread.t_ctl_waitq);
+       INIT_LIST_HEAD(&m->ofd_inconsistency_list);
+       spin_lock_init(&m->ofd_inconsistency_lock);
 
        spin_lock_init(&m->ofd_batch_lock);
-       rwlock_init(&obd->u.filter.fo_sptlrpc_lock);
-       sptlrpc_rule_set_init(&obd->u.filter.fo_sptlrpc_rset);
+       init_rwsem(&m->ofd_lastid_rwsem);
 
        obd->u.filter.fo_fl_oss_capa = 0;
        CFS_INIT_LIST_HEAD(&obd->u.filter.fo_capa_keys);
@@ -2102,7 +2244,14 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
        if (rc)
                GOTO(err_fini_lut, rc);
 
+       rc = ofd_start_inconsistency_verification_thread(m);
+       if (rc != 0)
+               GOTO(err_fini_fs, rc);
+
        RETURN(0);
+
+err_fini_fs:
+       ofd_fs_cleanup(env, m);
 err_fini_lut:
        tgt_fini(env, &m->ofd_lut);
 err_free_ns:
@@ -2117,16 +2266,20 @@ err_fini_proc:
 
 static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
 {
-       struct obd_device *obd = ofd_obd(m);
-       struct lu_device  *d = &m->ofd_dt_dev.dd_lu_dev;
+       struct obd_device       *obd = ofd_obd(m);
+       struct lu_device        *d   = &m->ofd_dt_dev.dd_lu_dev;
+       struct lfsck_stop        stop;
 
-       lfsck_stop(env, m->ofd_osd, true);
-       lfsck_degister(env, m->ofd_osd);
+       stop.ls_status = LS_PAUSED;
+       stop.ls_flags = 0;
+       lfsck_stop(env, m->ofd_osd, &stop);
        target_recovery_fini(obd);
        obd_exports_barrier(obd);
        obd_zombie_barrier();
 
        tgt_fini(env, &m->ofd_lut);
+       ofd_stop_inconsistency_verification_thread(m);
+       lfsck_degister(env, m->ofd_osd);
        ofd_fs_cleanup(env, m);
 
        ofd_free_capa_keys(m);
@@ -2140,8 +2293,8 @@ static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
 
        ofd_stack_fini(env, m, &m->ofd_dt_dev.dd_lu_dev);
        ofd_procfs_fini(m);
-       LASSERT(cfs_atomic_read(&d->ld_ref) == 0);
-       server_put_mount(obd->obd_name);
+       LASSERT(atomic_read(&d->ld_ref) == 0);
+       server_put_mount(obd->obd_name, true);
        EXIT;
 }
 
@@ -2235,7 +2388,6 @@ static struct lu_device_type ofd_device_type = {
 
 int __init ofd_init(void)
 {
-       struct lprocfs_static_vars      lvars;
        int                             rc;
 
        rc = lu_kmem_init(ofd_caches);
@@ -2248,13 +2400,11 @@ int __init ofd_init(void)
                return(rc);
        }
 
-       lprocfs_ofd_init_vars(&lvars);
-
-       rc = class_register_type(&ofd_obd_ops, NULL, NULL,
+       rc = class_register_type(&ofd_obd_ops, NULL, true, NULL,
 #ifndef HAVE_ONLY_PROCFS_SEQ
-                               lvars.module_vars,
+                                NULL,
 #endif
-                               LUSTRE_OST_NAME, &ofd_device_type);
+                                LUSTRE_OST_NAME, &ofd_device_type);
        return rc;
 }