LU-6401 headers: move swab functions to new header files

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

diff --git a/lustre/quota/qsd_reint.c b/lustre/quota/qsd_reint.c
index fea082f..5263c52 100644 (file)
--- a/lustre/quota/qsd_reint.c
+++ b/lustre/quota/qsd_reint.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -30,6 +30,8 @@
 
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
+#include <linux/kthread.h>
+#include <lustre_swab.h>
 #include "qsd_internal.h"
 
 /*
@@ -305,7 +307,7 @@ static int qsd_reconciliation(const struct lu_env *env,
        LASSERT(qqi->qqi_glb_obj != NULL);
        iops = &qqi->qqi_glb_obj->do_index_ops->dio_it;
 
-       it = iops->init(env, qqi->qqi_glb_obj, 0, BYPASS_CAPA);
+       it = iops->init(env, qqi->qqi_glb_obj, 0);
        if (IS_ERR(it)) {
                CWARN("%s: Initialize it for "DFID" failed. %ld\n",
                      qsd->qsd_svname, PFID(&qqi->qqi_fid), PTR_ERR(it));
@@ -497,7 +499,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);
                }
@@ -515,8 +517,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:
@@ -552,13 +554,13 @@ 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)
+static int qsd_entry_iter_cb(struct cfs_hash *hs, struct cfs_hash_bd *bd,
+                            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);
@@ -579,9 +581,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);
                }
        }
@@ -589,7 +591,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",