Skip to content

Commit b510af0

Browse files
author
Andreas Gruenbacher
committed
gfs2: quota need_sync cleanup
Rename variable 'value' to 'change' as it stores a change in value. Add new 'value' and 'limit' variables for the current value and limit. Only fetch the tuning parameters when we need them. Get rid of unnecessary nesting. No change in functionality. Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 7da4d6e commit b510af0

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

fs/gfs2/quota.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,34 +1117,32 @@ static bool need_sync(struct gfs2_quota_data *qd)
11171117
{
11181118
struct gfs2_sbd *sdp = qd->qd_sbd;
11191119
struct gfs2_tune *gt = &sdp->sd_tune;
1120-
s64 value;
1120+
s64 value, change, limit;
11211121
unsigned int num, den;
11221122

11231123
if (!qd->qd_qb.qb_limit)
11241124
return false;
11251125

11261126
spin_lock(&qd_lock);
1127-
value = qd->qd_change;
1127+
change = qd->qd_change;
11281128
spin_unlock(&qd_lock);
11291129

1130+
if (change <= 0)
1131+
return false;
1132+
value = (s64)be64_to_cpu(qd->qd_qb.qb_value);
1133+
limit = (s64)be64_to_cpu(qd->qd_qb.qb_limit);
1134+
if (value >= limit)
1135+
return false;
1136+
11301137
spin_lock(&gt->gt_spin);
11311138
num = gt->gt_quota_scale_num;
11321139
den = gt->gt_quota_scale_den;
11331140
spin_unlock(&gt->gt_spin);
11341141

1135-
if (value <= 0)
1136-
return false;
1137-
else if ((s64)be64_to_cpu(qd->qd_qb.qb_value) >=
1138-
(s64)be64_to_cpu(qd->qd_qb.qb_limit))
1142+
change *= gfs2_jindex_size(sdp) * num;
1143+
change = div_s64(change, den);
1144+
if (value + change < limit)
11391145
return false;
1140-
else {
1141-
value *= gfs2_jindex_size(sdp) * num;
1142-
value = div_s64(value, den);
1143-
value += (s64)be64_to_cpu(qd->qd_qb.qb_value);
1144-
if (value < (s64)be64_to_cpu(qd->qd_qb.qb_limit))
1145-
return false;
1146-
}
1147-
11481146
return true;
11491147
}
11501148

0 commit comments

Comments
 (0)