return started;
}
+struct qsd_reint_args {
+ struct qsd_qtype_info *qra_qqi;
+ struct lu_env qra_env;
+ struct completion *qra_started;
+};
+
+#ifndef TASK_IDLE
+#define TASK_IDLE TASK_INTERRUPTIBLE
+#endif
+
/*
* Routine executed by the reintegration thread.
*/
-static int qsd_reint_main(void *args)
+static int qsd_reint_main(void *_args)
{
- struct lu_env *env;
+ struct qsd_reint_args *args = _args;
+ struct lu_env *env = &args->qra_env;
struct qsd_thread_info *qti;
- struct qsd_qtype_info *qqi = (struct qsd_qtype_info *)args;
+ struct qsd_qtype_info *qqi = args->qra_qqi;
struct qsd_instance *qsd = qqi->qqi_qsd;
- struct ptlrpc_thread *thread = &qqi->qqi_reint_thread;
int rc;
ENTRY;
qsd->qsd_svname, PFID(&qqi->qqi_fid));
qqi_getref(qqi);
- lu_ref_add(&qqi->qqi_reference, "reint_thread", thread);
-
- thread_set_flags(thread, SVC_RUNNING);
- wake_up(&thread->t_ctl_waitq);
-
- OBD_ALLOC_PTR(env);
- if (env == NULL)
- GOTO(out, rc = -ENOMEM);
-
- /* initialize environment */
- rc = lu_env_init(env, LCT_DT_THREAD);
- if (rc)
- GOTO(out_env, rc);
+ lu_ref_add(&qqi->qqi_reference, "reint_thread", current);
qti = qsd_info(env);
+ complete(args->qra_started);
+
/* wait for the connection to master established */
- wait_event_idle(thread->t_ctl_waitq,
- qsd_connected(qsd) || !thread_is_running(thread));
+ while (({set_current_state(TASK_IDLE);
+ !qsd_connected(qsd) && !kthread_should_stop(); }))
+ schedule();
+ __set_current_state(TASK_RUNNING);
/* Step 1: enqueue global index lock */
- if (!thread_is_running(thread))
+ if (kthread_should_stop())
GOTO(out_env_init, rc = 0);
LASSERT(qsd->qsd_exp != NULL);
}
/* Step 2: reintegrate global index */
- if (!thread_is_running(thread))
+ if (kthread_should_stop())
GOTO(out_lock, rc = 0);
OBD_FAIL_TIMEOUT(OBD_FAIL_QUOTA_DELAY_REINT, 10);
}
/* Step 3: reintegrate slave index */
- if (!thread_is_running(thread))
+ if (kthread_should_stop())
GOTO(out_lock, rc = 0);
if (qqi->qqi_slv_ver != qti->qti_slv_ver) {
}
/* wait for the qsd instance started (target recovery done) */
- wait_event_idle(thread->t_ctl_waitq,
- qsd_started(qsd) || !thread_is_running(thread));
+ while (({set_current_state(TASK_IDLE);
+ !qsd_started(qsd) && !kthread_should_stop(); }))
+ schedule();
+ __set_current_state(TASK_RUNNING);
- if (!thread_is_running(thread))
+ if (kthread_should_stop())
GOTO(out_lock, rc = 0);
/* Step 4: start reconciliation for each enforced ID */
ldlm_lock_decref(&qqi->qqi_lockh, qsd_glb_einfo.ei_mode);
out_env_init:
lu_env_fini(env);
-out_env:
- OBD_FREE_PTR(env);
-out:
+ OBD_FREE_PTR(args);
write_lock(&qsd->qsd_lock);
qqi->qqi_reint = 0;
write_unlock(&qsd->qsd_lock);
- thread_set_flags(thread, SVC_STOPPED);
- wake_up(&thread->t_ctl_waitq);
+ if (xchg(&qqi->qqi_reint_task, NULL) == NULL)
+ wait_var_event(qqi, kthread_should_stop());
- lu_ref_del(&qqi->qqi_reference, "reint_thread", thread);
+ lu_ref_del(&qqi->qqi_reference, "reint_thread", current);
qqi_putref(qqi);
return rc;
void qsd_stop_reint_thread(struct qsd_qtype_info *qqi)
{
- struct ptlrpc_thread *thread = &qqi->qqi_reint_thread;
-
- if (!thread_is_stopped(thread)) {
- thread_set_flags(thread, SVC_STOPPING);
- wake_up(&thread->t_ctl_waitq);
+ struct task_struct *task;
- wait_event_idle(thread->t_ctl_waitq,
- thread_is_stopped(thread));
- }
+ task = xchg(&qqi->qqi_reint_task, NULL);
+ if (task)
+ kthread_stop(task);
}
static int qsd_entry_iter_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd,
int qsd_start_reint_thread(struct qsd_qtype_info *qqi)
{
- struct ptlrpc_thread *thread = &qqi->qqi_reint_thread;
struct qsd_instance *qsd = qqi->qqi_qsd;
struct task_struct *task;
+ struct qsd_reint_args *args;
+ DECLARE_COMPLETION_ONSTACK(started);
int rc;
- char *name;
ENTRY;
/* do not try to start a new thread as this can lead to a deadlock */
RETURN(0);
}
- OBD_ALLOC(name, MTI_NAME_MAXLEN);
- if (name == NULL)
- RETURN(-ENOMEM);
- snprintf(name, MTI_NAME_MAXLEN, "qsd_reint_%d.%s",
- qqi->qqi_qtype, qsd->qsd_svname);
+ OBD_ALLOC_PTR(args);
+ if (args == NULL)
+ GOTO(out, rc = -ENOMEM);
- task = kthread_run(qsd_reint_main, qqi, name);
- OBD_FREE(name, MTI_NAME_MAXLEN);
+ args->qra_started = &started;
+ args->qra_qqi = qqi;
+ /* initialize environment */
+ rc = lu_env_init(&args->qra_env, LCT_DT_THREAD);
+ if (rc)
+ GOTO(out_args, rc);
+ task = kthread_create(qsd_reint_main, args, "qsd_reint_%d.%s",
+ qqi->qqi_qtype, qsd->qsd_svname);
if (IS_ERR(task)) {
rc = PTR_ERR(task);
- thread_set_flags(thread, SVC_STOPPED);
+ lu_env_fini(&args->qra_env);
+out_args:
+ OBD_FREE_PTR(args);
+out:
write_lock(&qsd->qsd_lock);
qqi->qqi_reint = 0;
write_unlock(&qsd->qsd_lock);
RETURN(rc);
}
- wait_event_idle(thread->t_ctl_waitq,
- thread_is_running(thread) || thread_is_stopped(thread));
+ qqi->qqi_reint_task = task;
+ wake_up_process(task);
+ wait_for_completion(&started);
+
RETURN(0);
}