diff options
Diffstat (limited to 'fs/gfs2/quota.c')
-rw-r--r-- | fs/gfs2/quota.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index c0352cf330a3..40c7cf87eb44 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c | |||
@@ -395,7 +395,8 @@ static int qd_trylock(struct gfs2_quota_data *qd) | |||
395 | 395 | ||
396 | static void qd_unlock(struct gfs2_quota_data *qd) | 396 | static void qd_unlock(struct gfs2_quota_data *qd) |
397 | { | 397 | { |
398 | gfs2_assert_warn(qd->qd_gl->gl_sbd, test_bit(QDF_LOCKED, &qd->qd_flags)); | 398 | gfs2_assert_warn(qd->qd_gl->gl_sbd, |
399 | test_bit(QDF_LOCKED, &qd->qd_flags)); | ||
399 | clear_bit(QDF_LOCKED, &qd->qd_flags); | 400 | clear_bit(QDF_LOCKED, &qd->qd_flags); |
400 | bh_put(qd); | 401 | bh_put(qd); |
401 | slot_put(qd); | 402 | slot_put(qd); |
@@ -715,7 +716,8 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda) | |||
715 | qd = qda[x]; | 716 | qd = qda[x]; |
716 | offset = qd2offset(qd); | 717 | offset = qd2offset(qd); |
717 | error = gfs2_adjust_quota(ip, offset, qd->qd_change_sync, | 718 | error = gfs2_adjust_quota(ip, offset, qd->qd_change_sync, |
718 | (struct gfs2_quota_data *)qd->qd_gl->gl_lvb); | 719 | (struct gfs2_quota_data *) |
720 | qd->qd_gl->gl_lvb); | ||
719 | if (error) | 721 | if (error) |
720 | goto out_end_trans; | 722 | goto out_end_trans; |
721 | 723 | ||
@@ -932,7 +934,8 @@ static int print_message(struct gfs2_quota_data *qd, char *type) | |||
932 | if (!line) | 934 | if (!line) |
933 | return -ENOMEM; | 935 | return -ENOMEM; |
934 | 936 | ||
935 | len = snprintf(line, MAX_LINE-1, "GFS2: fsid=%s: quota %s for %s %u\r\n", | 937 | len = snprintf(line, MAX_LINE-1, |
938 | "GFS2: fsid=%s: quota %s for %s %u\r\n", | ||
936 | sdp->sd_fsname, type, | 939 | sdp->sd_fsname, type, |
937 | (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group", | 940 | (test_bit(QDF_USER, &qd->qd_flags)) ? "user" : "group", |
938 | qd->qd_id); | 941 | qd->qd_id); |
@@ -981,7 +984,8 @@ int gfs2_quota_check(struct gfs2_inode *ip, uint32_t uid, uint32_t gid) | |||
981 | } else if (qd->qd_qb.qb_warn && | 984 | } else if (qd->qd_qb.qb_warn && |
982 | (int64_t)qd->qd_qb.qb_warn < value && | 985 | (int64_t)qd->qd_qb.qb_warn < value && |
983 | time_after_eq(jiffies, qd->qd_last_warn + | 986 | time_after_eq(jiffies, qd->qd_last_warn + |
984 | gfs2_tune_get(sdp, gt_quota_warn_period) * HZ)) { | 987 | gfs2_tune_get(sdp, |
988 | gt_quota_warn_period) * HZ)) { | ||
985 | error = print_message(qd, "warning"); | 989 | error = print_message(qd, "warning"); |
986 | qd->qd_last_warn = jiffies; | 990 | qd->qd_last_warn = jiffies; |
987 | } | 991 | } |