LU-3963 cleanup: C89 and build cleanups

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

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 6c5439c..a27e4b0 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -443,6 +443,8 @@ static int ofd_prepare(const struct lu_env *env, struct lu_device *pdev,
        }
 
        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);
 
        lsp.lsp_start = NULL;
@@ -1654,7 +1656,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);
 
@@ -2061,8 +2063,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
        },
        {
@@ -2126,6 +2128,9 @@ 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);
@@ -2187,7 +2192,7 @@ static int ofd_init0(const struct lu_env *env, struct ofd_device *m,
                                obd->obd_name, osfs->os_bsize);
                GOTO(err_fini_stack, rc = -EPROTO);
        }
-       m->ofd_blockbits = fls(osfs->os_bsize) - 1;
+       m->ofd_blockbits = __fls(osfs->os_bsize) - 1;
 
        m->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;
        if (osfs->os_bsize * osfs->os_blocks < OFD_PRECREATE_SMALL_FS)
@@ -2230,7 +2235,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:
@@ -2252,12 +2264,13 @@ static void ofd_fini(const struct lu_env *env, struct ofd_device *m)
        stop.ls_status = LS_PAUSED;
        stop.ls_flags = 0;
        lfsck_stop(env, m->ofd_osd, &stop);
-       lfsck_degister(env, m->ofd_osd);
        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);