LU-4920 quota: always clear lqe_lockh on lock cancel

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

diff --git a/lustre/quota/qmt_dev.c b/lustre/quota/qmt_dev.c
index 8401030..28783a0 100644 (file)
--- a/lustre/quota/qmt_dev.c
+++ b/lustre/quota/qmt_dev.c
@@ -236,7 +236,7 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
 
        /* set up and start rebalance thread */
        thread_set_flags(&qmt->qmt_reba_thread, SVC_STOPPED);
-       cfs_waitq_init(&qmt->qmt_reba_thread.t_ctl_waitq);
+       init_waitqueue_head(&qmt->qmt_reba_thread.t_ctl_waitq);
        CFS_INIT_LIST_HEAD(&qmt->qmt_reba_list);
        spin_lock_init(&qmt->qmt_reba_lock);
        rc = qmt_start_reba_thread(qmt);
@@ -252,8 +252,8 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
        LASSERT(type != NULL);
 
        /* register proc directory associated with this qmt */
-       qmt->qmt_proc = lprocfs_register(qmt->qmt_svname, type->typ_procroot,
-                                        NULL, NULL);
+       qmt->qmt_proc = lprocfs_seq_register(qmt->qmt_svname, type->typ_procroot,
+                                               NULL, NULL);
        if (IS_ERR(qmt->qmt_proc)) {
                rc = PTR_ERR(qmt->qmt_proc);
                CERROR("%s: failed to create qmt proc entry (%d)\n",
@@ -466,8 +466,11 @@ int qmt_glb_init(void)
        int rc;
        ENTRY;
 
-       rc = class_register_type(&qmt_obd_ops, NULL, NULL, LUSTRE_QMT_NAME,
-                                &qmt_device_type);
+       rc = class_register_type(&qmt_obd_ops, NULL, true, NULL,
+#ifndef HAVE_ONLY_PROCFS_SEQ
+                                NULL,
+#endif
+                                LUSTRE_QMT_NAME, &qmt_device_type);
        RETURN(rc);
 }