From: johann <johann>
Date: Fri, 2 May 2008 18:45:35 +0000 (+0000)
Subject: Branch b_release_1_6_5
X-Git-Tag: v1_7_0_50~31
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a2ed29cd77499c51d9a02e8e06ee69d69a41ddc3;p=fs%2Flustre-release.git

Branch b_release_1_6_5
b=13904
i=johann
i=tianzy

Quota data should not be stored in a 32-bit variable. Use __u64 instead.
---

diff --git a/lustre/quota/quota_context.c b/lustre/quota/quota_context.c
index 11b7a91..a0b6bf1 100644
--- a/lustre/quota/quota_context.c
+++ b/lustre/quota/quota_context.c
@@ -524,7 +524,7 @@ dqacq_completion(struct obd_device *obd, struct lustre_quota_ctxt *qctxt,
 
         /* update local operational quota file */
         if (rc == 0) {
-                __u32 count = QUSG(qdata->qd_count, QDATA_IS_BLK(qdata));
+                __u64 count = QUSG(qdata->qd_count, QDATA_IS_BLK(qdata));
                 struct obd_quotactl *qctl;
                 __u64 *hardlimit;
 
@@ -559,7 +559,7 @@ dqacq_completion(struct obd_device *obd, struct lustre_quota_ctxt *qctxt,
                         break;
                 case QUOTA_DQREL:
                         LASSERTF(count < *hardlimit,
-                                 "count: %d, hardlimit: "LPU64".\n",
+                                 "count: "LPU64", hardlimit: "LPU64".\n",
                                  count, *hardlimit);
                         *hardlimit -= count;
                         break;