LU-12930 various: use schedule_timeout_*interruptible

[fs/lustre-release.git] / lustre / mdd / mdd_device.c

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 54fe466..acb5d37 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -145,7 +145,7 @@ static int mdd_init0(const struct lu_env *env, struct mdd_device *mdd,
        /* sync permission changes */
        mdd->mdd_sync_permission = 1;
        /* enable changelog garbage collection */
-       mdd->mdd_changelog_gc = 0;
+       mdd->mdd_changelog_gc = 1;
        /* with a significant amount of idle time */
        mdd->mdd_changelog_max_idle_time = CHLOG_MAX_IDLE_TIME;
        /* or a significant amount of late indexes */
@@ -376,6 +376,8 @@ static int llog_changelog_cancel(const struct lu_env *env,
        RETURN(rc);
 }
 
+static struct llog_operations changelog_orig_logops;
+
 static int
 mdd_changelog_write_header(const struct lu_env *env, struct mdd_device *mdd,
                           int markerflags);
@@ -440,7 +442,7 @@ static int mdd_changelog_llog_init(const struct lu_env *env,
        OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
        obd->obd_lvfs_ctxt.dt = mdd->mdd_bottom;
        rc = llog_setup(env, obd, &obd->obd_olg, LLOG_CHANGELOG_ORIG_CTXT,
-                       obd, &llog_common_cat_ops);
+                       obd, &changelog_orig_logops);
        if (rc) {
                CERROR("%s: changelog llog setup failed: rc = %d\n",
                       obd->obd_name, rc);
@@ -473,7 +475,7 @@ static int mdd_changelog_llog_init(const struct lu_env *env,
 
        /* setup user changelog */
        rc = llog_setup(env, obd, &obd->obd_olg, LLOG_CHANGELOG_USER_ORIG_CTXT,
-                       obd, &llog_common_cat_ops);
+                       obd, &changelog_orig_logops);
        if (rc) {
                CERROR("%s: changelog users llog setup failed: rc = %d\n",
                       obd->obd_name, rc);
@@ -614,7 +616,8 @@ again:
                         * and to have set mc_gc_task to itself
                         */
                        spin_unlock(&mdd->mdd_cl.mc_lock);
-                       schedule_timeout(usecs_to_jiffies(10));
+                       /* Add a tiny sleep */
+                       schedule_timeout_uninterruptible(1);
                        /* go back to fully check if GC-thread has started or
                         * even already exited or if a new one is starting...
                         */
@@ -735,9 +738,6 @@ int mdd_changelog_write_header(const struct lu_env *env,
                                            rec->cr.cr_namelen);
        rec->cr_hdr.lrh_type = CHANGELOG_REC;
        rec->cr.cr_time = cl_time();
-       spin_lock(&mdd->mdd_cl.mc_lock);
-       rec->cr.cr_index = ++mdd->mdd_cl.mc_index;
-       spin_unlock(&mdd->mdd_cl.mc_lock);
 
        ctxt = llog_get_context(obd, LLOG_CHANGELOG_ORIG_CTXT);
        LASSERT(ctxt);
@@ -1498,7 +1498,7 @@ static int mdd_obd_set_info_async(const struct lu_env *env,
        RETURN(rc);
 }
 
-static struct obd_ops mdd_obd_device_ops = {
+static const struct obd_ops mdd_obd_device_ops = {
        .o_owner        = THIS_MODULE,
        .o_connect      = mdd_obd_connect,
        .o_disconnect   = mdd_obd_disconnect,
@@ -2008,6 +2008,9 @@ static int __init mdd_init(void)
        if (rc)
                return rc;
 
+       changelog_orig_logops = llog_common_cat_ops;
+       changelog_orig_logops.lop_write_rec = mdd_changelog_write_rec;
+
        rc = class_register_type(&mdd_obd_device_ops, NULL, false, NULL,
                                 LUSTRE_MDD_NAME, &mdd_device_type);
        if (rc)