LU-6142 lustre: don't take spinlock to read a 'long'.

[fs/lustre-release.git] / lustre / target / tgt_grant.c

diff --git a/lustre/target/tgt_grant.c b/lustre/target/tgt_grant.c
index 8facd60..72416e0 100644 (file)
--- a/lustre/target/tgt_grant.c
+++ b/lustre/target/tgt_grant.c
@@ -902,6 +902,9 @@ static long tgt_grant_alloc(struct obd_export *exp, u64 curgrant,
 
        ENTRY;
 
+       if (OBD_FAIL_CHECK(OBD_FAIL_TGT_NO_GRANT))
+               RETURN(0);
+
        /* When tgd_grant_compat_disable is set, we don't grant any space to
         * clients not supporting OBD_CONNECT_GRANT_PARAM.
         * Otherwise, space granted to such a client is inflated since it
@@ -1089,22 +1092,25 @@ void tgt_grant_discard(struct obd_export *exp)
 
        tgd = &lut->lut_tgd;
        spin_lock(&tgd->tgd_grant_lock);
-       LASSERTF(tgd->tgd_tot_granted >= ted->ted_grant,
-                "%s: tot_granted %llu cli %s/%p ted_grant %ld\n",
-                obd->obd_name, tgd->tgd_tot_granted,
-                exp->exp_client_uuid.uuid, exp, ted->ted_grant);
+       if (tgd->tgd_tot_granted < ted->ted_grant) {
+               CERROR("%s: tot_granted %llu < cli %s/%p ted_grant %ld\n",
+                      obd->obd_name, tgd->tgd_tot_granted,
+                      exp->exp_client_uuid.uuid, exp, ted->ted_grant);
+       }
        tgd->tgd_tot_granted -= ted->ted_grant;
        ted->ted_grant = 0;
-       LASSERTF(tgd->tgd_tot_pending >= ted->ted_pending,
-                "%s: tot_pending %llu cli %s/%p ted_pending %ld\n",
-                obd->obd_name, tgd->tgd_tot_pending,
-                exp->exp_client_uuid.uuid, exp, ted->ted_pending);
+       if (tgd->tgd_tot_pending < ted->ted_pending) {
+               CERROR("%s: tot_pending %llu < cli %s/%p ted_pending %ld\n",
+                      obd->obd_name, tgd->tgd_tot_pending,
+                      exp->exp_client_uuid.uuid, exp, ted->ted_pending);
+       }
        /* tgd_tot_pending is handled in tgt_grant_commit as bulk
         * commmits */
-       LASSERTF(tgd->tgd_tot_dirty >= ted->ted_dirty,
-                "%s: tot_dirty %llu cli %s/%p ted_dirty %ld\n",
-                obd->obd_name, tgd->tgd_tot_dirty,
-                exp->exp_client_uuid.uuid, exp, ted->ted_dirty);
+       if (tgd->tgd_tot_dirty < ted->ted_dirty) {
+               CERROR("%s: tot_dirty %llu < cli %s/%p ted_dirty %ld\n",
+                      obd->obd_name, tgd->tgd_tot_dirty,
+                      exp->exp_client_uuid.uuid, exp, ted->ted_dirty);
+       }
        tgd->tgd_tot_dirty -= ted->ted_dirty;
        ted->ted_dirty = 0;
        spin_unlock(&tgd->tgd_grant_lock);