LU-5710 all: fourth set of corrected typos and grammar errors

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

diff --git a/lustre/quota/qmt_handler.c b/lustre/quota/qmt_handler.c
index a3edbdc..a1f0f1b 100644 (file)
--- a/lustre/quota/qmt_handler.c
+++ b/lustre/quota/qmt_handler.c
@@ -312,13 +312,6 @@ static int qmt_quotactl(const struct lu_env *env, struct lu_device *ld,
                                     dqb->dqb_valid & QIF_BFLAGS);
                break;
 
-       case Q_QUOTAON:
-       case Q_QUOTAOFF:   /* quota is always turned on on the master */
-               RETURN(0);
-
-       case LUSTRE_Q_INVALIDATE: /* not supported any more */
-               RETURN(-ENOTSUPP);
-
        default:
                CERROR("%s: unsupported quotactl command: %d\n",
                       qmt->qmt_svname, oqctl->qc_cmd);
@@ -649,7 +642,7 @@ static int qmt_dqacq(const struct lu_env *env, struct lu_device *ld,
 
                        svc = req->rq_rqbd->rqbd_svcpt;
                        timeout = at_est2timeout(at_get(&svc->scp_at_estimate));
-                       timeout = max(timeout, ldlm_timeout);
+                       timeout += (ldlm_bl_timeout(lock) >> 1);
 
                        /* lock is being cancelled, prolong timeout */
                        ldlm_refresh_waiting_lock(lock, timeout);