LU-5436 quota: use OBD_SLAB_FREE_PTR() to free lqe

[fs/lustre-release.git] / lustre / quota / qsd_reint.c

diff --git a/lustre/quota/qsd_reint.c b/lustre/quota/qsd_reint.c
index 15fc40f..c4c6e11 100644 (file)
--- a/lustre/quota/qsd_reint.c
+++ b/lustre/quota/qsd_reint.c
@@ -28,10 +28,6 @@
  * Author: Niu    Yawei    <yawei.niu@intel.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include "qsd_internal.h"
@@ -424,7 +420,7 @@ static int qsd_reint_main(void *args)
        lu_ref_add(&qqi->qqi_reference, "reint_thread", thread);
 
        thread_set_flags(thread, SVC_RUNNING);
-       cfs_waitq_signal(&thread->t_ctl_waitq);
+       wake_up(&thread->t_ctl_waitq);
 
        OBD_ALLOC_PTR(env);
        if (env == NULL)
@@ -501,7 +497,7 @@ static int qsd_reint_main(void *args)
        if (qqi->qqi_slv_ver != qti->qti_slv_ver) {
                rc = qsd_reint_index(env, qqi, false);
                if (rc) {
-                       CWARN("%s: Reint slave for "DFID" failed. %d\n",
+                       CWARN("%s: reintegration for "DFID" failed with %d\n",
                              qsd->qsd_svname, PFID(&qqi->qqi_slv_fid), rc);
                        GOTO(out_lock, rc);
                }
@@ -509,7 +505,7 @@ static int qsd_reint_main(void *args)
                qsd_bump_version(qqi, qqi->qqi_slv_ver, false);
        }
 
-       /* wait for the connection to master established */
+       /* wait for the qsd instance started (target recovery done) */
        l_wait_event(thread->t_ctl_waitq,
                     qsd_started(qsd) || !thread_is_running(thread), &lwi);
 
@@ -519,8 +515,8 @@ static int qsd_reint_main(void *args)
        /* Step 4: start reconciliation for each enforced ID */
        rc = qsd_reconciliation(env, qqi);
        if (rc)
-               CWARN("%s: reconciliation failed. "DFID", %d\n",
-                     qsd->qsd_svname, PFID(&qti->qti_fid), rc);
+               CWARN("%s: reconciliation for "DFID" failed with %d\n",
+                     qsd->qsd_svname, PFID(&qqi->qqi_slv_fid), rc);
 
        EXIT;
 out_lock:
@@ -538,7 +534,7 @@ out:
        lu_ref_del(&qqi->qqi_reference, "reint_thread", thread);
 
        thread_set_flags(thread, SVC_STOPPED);
-       cfs_waitq_signal(&thread->t_ctl_waitq);
+       wake_up(&thread->t_ctl_waitq);
        return rc;
 }
 
@@ -549,7 +545,7 @@ void qsd_stop_reint_thread(struct qsd_qtype_info *qqi)
 
        if (!thread_is_stopped(thread)) {
                thread_set_flags(thread, SVC_STOPPING);
-               cfs_waitq_signal(&thread->t_ctl_waitq);
+               wake_up(&thread->t_ctl_waitq);
 
                l_wait_event(thread->t_ctl_waitq,
                             thread_is_stopped(thread), &lwi);
@@ -557,12 +553,12 @@ void qsd_stop_reint_thread(struct qsd_qtype_info *qqi)
 }
 
 static int qsd_entry_iter_cb(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-                            cfs_hlist_node_t *hnode, void *data)
+                            struct hlist_node *hnode, void *data)
 {
        struct lquota_entry     *lqe;
        int                     *pending = (int *)data;
 
-       lqe = cfs_hlist_entry(hnode, struct lquota_entry, lqe_hash);
+       lqe = hlist_entry(hnode, struct lquota_entry, lqe_hash);
        LASSERT(atomic_read(&lqe->lqe_ref) > 0);
 
        lqe_read_lock(lqe);
@@ -583,9 +579,9 @@ static bool qsd_pending_updates(struct qsd_qtype_info *qqi)
 
        /* any pending quota adjust? */
        spin_lock(&qsd->qsd_adjust_lock);
-       cfs_list_for_each_entry_safe(lqe, n, &qsd->qsd_adjust_list, lqe_link) {
+       list_for_each_entry_safe(lqe, n, &qsd->qsd_adjust_list, lqe_link) {
                if (lqe2qqi(lqe) == qqi) {
-                       cfs_list_del_init(&lqe->lqe_link);
+                       list_del_init(&lqe->lqe_link);
                        lqe_putref(lqe);
                }
        }
@@ -593,7 +589,7 @@ static bool qsd_pending_updates(struct qsd_qtype_info *qqi)
 
        /* any pending updates? */
        read_lock(&qsd->qsd_lock);
-       cfs_list_for_each_entry(upd, &qsd->qsd_upd_list, qur_link) {
+       list_for_each_entry(upd, &qsd->qsd_upd_list, qur_link) {
                if (upd->qur_qqi == qqi) {
                        read_unlock(&qsd->qsd_lock);
                        CDEBUG(D_QUOTA, "%s: pending %s updates for type:%d.\n",
@@ -626,15 +622,17 @@ 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 l_wait_info      lwi = { 0 };
-       int                     rc;
+       struct l_wait_info       lwi = { 0 };
+       struct task_struct      *task;
+       int                      rc;
+       char                    *name;
        ENTRY;
 
        /* don't bother to do reintegration when quota isn't enabled */
-       if (!qsd_type_enabled(qqi->qqi_qsd, qqi->qqi_qtype))
+       if (!qsd_type_enabled(qsd, qqi->qqi_qtype))
                RETURN(0);
 
-       if (qqi->qqi_qsd->qsd_acct_failed)
+       if (qsd->qsd_acct_failed)
                /* no space accounting support, can't enable enforcement */
                RETURN(0);
 
@@ -660,8 +658,18 @@ int qsd_start_reint_thread(struct qsd_qtype_info *qqi)
                RETURN(0);
        }
 
-       rc = PTR_ERR(kthread_run(qsd_reint_main, (void *)qqi, "qsd_reint"));
-       if (IS_ERR_VALUE(rc)) {
+       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);
+
+       task = kthread_run(qsd_reint_main, qqi, name);
+       OBD_FREE(name, MTI_NAME_MAXLEN);
+
+       if (IS_ERR(task)) {
+               rc = PTR_ERR(task);
                thread_set_flags(thread, SVC_STOPPED);
                write_lock(&qsd->qsd_lock);
                qqi->qqi_reint = 0;