LU-2346 quota: set default grace time

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

diff --git a/lustre/quota/qmt_lock.c b/lustre/quota/qmt_lock.c
index 3067ce7..70ab3b4 100644 (file)
--- a/lustre/quota/qmt_lock.c
+++ b/lustre/quota/qmt_lock.c
@@ -56,6 +56,8 @@ int qmt_intent_policy(const struct lu_env *env, struct lu_device *ld,
        ENTRY;
 
        req_capsule_extend(&req->rq_pill, &RQF_LDLM_INTENT_QUOTA);
+       req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER,
+                            ldlm_lvbo_size(*lockp));
 
        /* extract quota body and intent opc */
        it = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT);
@@ -132,8 +134,6 @@ int qmt_intent_policy(const struct lu_env *env, struct lu_device *ld,
        }
 
        /* on success, pack lvb in reply */
-       req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER,
-                            ldlm_lvbo_size(*lockp));
        lvb = req_capsule_server_get(&req->rq_pill, &RMF_DLM_LVB);
        ldlm_lvbo_fill(*lockp, lvb, ldlm_lvbo_size(*lockp));
        EXIT;
@@ -252,7 +252,8 @@ int qmt_lvbo_update(struct lu_device *ld, struct ldlm_resource *res,
                /* no need to update lvb for global quota locks */
                RETURN(0);
 
-       lvb = req_capsule_server_get(&req->rq_pill, &RMF_DLM_LVB);
+       lvb = req_capsule_server_swab_get(&req->rq_pill, &RMF_DLM_LVB,
+                                         lustre_swab_lquota_lvb);
        if (lvb == NULL) {
                CERROR("%s: failed to extract lvb from request\n",
                       qmt->qmt_svname);
@@ -678,12 +679,12 @@ void qmt_id_lock_notify(struct qmt_device *qmt, struct lquota_entry *lqe)
        ENTRY;
 
        lqe_getref(lqe);
-       cfs_spin_lock(&qmt->qmt_reba_lock);
+       spin_lock(&qmt->qmt_reba_lock);
        if (!qmt->qmt_stopping && cfs_list_empty(&lqe->lqe_link)) {
                cfs_list_add_tail(&lqe->lqe_link, &qmt->qmt_reba_list);
                added = true;
        }
-       cfs_spin_unlock(&qmt->qmt_reba_lock);
+       spin_unlock(&qmt->qmt_reba_lock);
 
        if (added)
                cfs_waitq_signal(&qmt->qmt_reba_thread.t_ctl_waitq);
@@ -735,19 +736,19 @@ static int qmt_reba_thread(void *arg)
                             !cfs_list_empty(&qmt->qmt_reba_list) ||
                             !thread_is_running(thread), &lwi);
 
-               cfs_spin_lock(&qmt->qmt_reba_lock);
+               spin_lock(&qmt->qmt_reba_lock);
                cfs_list_for_each_entry_safe(lqe, tmp, &qmt->qmt_reba_list,
                                             lqe_link) {
                        cfs_list_del_init(&lqe->lqe_link);
-                       cfs_spin_unlock(&qmt->qmt_reba_lock);
+                       spin_unlock(&qmt->qmt_reba_lock);
 
                        if (thread_is_running(thread))
                                qmt_id_lock_glimpse(env, qmt, lqe, NULL);
 
                        lqe_putref(lqe);
-                       cfs_spin_lock(&qmt->qmt_reba_lock);
+                       spin_lock(&qmt->qmt_reba_lock);
                }
-               cfs_spin_unlock(&qmt->qmt_reba_lock);
+               spin_unlock(&qmt->qmt_reba_lock);
 
                if (!thread_is_running(thread))
                        break;