mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-18 14:25:25 +00:00
gfs2: Simplify function need_sync
This patch simplifies function need_sync by eliminating a variable in favor of just returning the appropriate value as soon as we know it. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
parent
e34c16c9c6
commit
2a4f651167
@ -1107,16 +1107,15 @@ int gfs2_quota_lock(struct gfs2_inode *ip, kuid_t uid, kgid_t gid)
|
|||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int need_sync(struct gfs2_quota_data *qd)
|
static bool need_sync(struct gfs2_quota_data *qd)
|
||||||
{
|
{
|
||||||
struct gfs2_sbd *sdp = qd->qd_sbd;
|
struct gfs2_sbd *sdp = qd->qd_sbd;
|
||||||
struct gfs2_tune *gt = &sdp->sd_tune;
|
struct gfs2_tune *gt = &sdp->sd_tune;
|
||||||
s64 value;
|
s64 value;
|
||||||
unsigned int num, den;
|
unsigned int num, den;
|
||||||
int do_sync = 1;
|
|
||||||
|
|
||||||
if (!qd->qd_qb.qb_limit)
|
if (!qd->qd_qb.qb_limit)
|
||||||
return 0;
|
return false;
|
||||||
|
|
||||||
spin_lock(&qd_lock);
|
spin_lock(&qd_lock);
|
||||||
value = qd->qd_change;
|
value = qd->qd_change;
|
||||||
@ -1128,19 +1127,19 @@ static int need_sync(struct gfs2_quota_data *qd)
|
|||||||
spin_unlock(>->gt_spin);
|
spin_unlock(>->gt_spin);
|
||||||
|
|
||||||
if (value < 0)
|
if (value < 0)
|
||||||
do_sync = 0;
|
return false;
|
||||||
else if ((s64)be64_to_cpu(qd->qd_qb.qb_value) >=
|
else if ((s64)be64_to_cpu(qd->qd_qb.qb_value) >=
|
||||||
(s64)be64_to_cpu(qd->qd_qb.qb_limit))
|
(s64)be64_to_cpu(qd->qd_qb.qb_limit))
|
||||||
do_sync = 0;
|
return false;
|
||||||
else {
|
else {
|
||||||
value *= gfs2_jindex_size(sdp) * num;
|
value *= gfs2_jindex_size(sdp) * num;
|
||||||
value = div_s64(value, den);
|
value = div_s64(value, den);
|
||||||
value += (s64)be64_to_cpu(qd->qd_qb.qb_value);
|
value += (s64)be64_to_cpu(qd->qd_qb.qb_value);
|
||||||
if (value < (s64)be64_to_cpu(qd->qd_qb.qb_limit))
|
if (value < (s64)be64_to_cpu(qd->qd_qb.qb_limit))
|
||||||
do_sync = 0;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return do_sync;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void gfs2_quota_unlock(struct gfs2_inode *ip)
|
void gfs2_quota_unlock(struct gfs2_inode *ip)
|
||||||
@ -1156,7 +1155,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
|
|||||||
|
|
||||||
for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
|
for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
|
||||||
struct gfs2_quota_data *qd;
|
struct gfs2_quota_data *qd;
|
||||||
int sync;
|
bool sync;
|
||||||
|
|
||||||
qd = ip->i_qadata->qa_qd[x];
|
qd = ip->i_qadata->qa_qd[x];
|
||||||
sync = need_sync(qd);
|
sync = need_sync(qd);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user