Branch b1_6

b=15036
i=johann
i=tianzy

update local vars types to handle with 64-bit limits

diff --git a/lustre/quota/quota_ctl.c b/lustre/quota/quota_ctl.c
index 3bd569b..8ab7c0e 100644 (file)
--- a/lustre/quota/quota_ctl.c
+++ b/lustre/quota/quota_ctl.c
@@ -251,7 +251,7 @@ int lov_quota_ctl(struct obd_export *exp, struct obd_quotactl *oqctl)
         struct obd_device *obd = class_exp2obd(exp);
         struct lov_obd *lov = &obd->u.lov;
         __u64 curspace = 0;
-        __u32 bhardlimit = 0;
+        __u64 bhardlimit = 0;
         int i, rc = 0;
         ENTRY;
 

diff --git a/lustre/quota/quota_master.c b/lustre/quota/quota_master.c
index 42b20a2..3d00db5 100644 (file)
--- a/lustre/quota/quota_master.c
+++ b/lustre/quota/quota_master.c
@@ -314,7 +314,7 @@ int dqacq_handler(struct obd_device *obd, struct qunit_data *qdata, int opc)
         struct lustre_quota_info *info = &mds->mds_quota_info;
         struct lustre_dquot *dquot = NULL;
         __u64 *usage = NULL;
-        __u32 hlimit = 0, slimit = 0;
+        __u64 hlimit = 0, slimit = 0;
         time_t *time = NULL;
         unsigned int grace = 0;
         struct lustre_qunit_size *lqs = NULL;