Skip to content

Commit c9cb9e3

Browse files
AstralBobAndreas Gruenbacher
authored andcommitted
gfs2: don't call quota_unhold if quotas are not locked
Before this patch, function gfs2_quota_unlock checked if quotas are turned off, and if so, it branched to label out, which called gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we no longer want to call gfs2_quota_unhold or we won't balance our gets and puts. Signed-off-by: Bob Peterson <[email protected]> Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent 4ed0c30 commit c9cb9e3

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

fs/gfs2/quota.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
11241124
int found;
11251125

11261126
if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags))
1127-
goto out;
1127+
return;
11281128

11291129
for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
11301130
struct gfs2_quota_data *qd;
@@ -1161,7 +1161,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip)
11611161
qd_unlock(qda[x]);
11621162
}
11631163

1164-
out:
11651164
gfs2_quota_unhold(ip);
11661165
}
11671166

0 commit comments

Comments
 (0)