Merge branch 'perf/rbtree_copy' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / quota.c

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 7c2003177884b17dc36dcf1bfa7ed604c54df289..9b61f92fcfdf0c85f37210f3fe5e630715be0c8e 100644 (file)
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -649,6 +649,8 @@ static void do_qc(struct gfs2_quota_data *qd, s64 change)
                slot_hold(qd);
        }
 
+       if (change < 0) /* Reset quiet flag if we freed some blocks */
+               clear_bit(QDF_QMSG_QUIET, &qd->qd_flags);
        mutex_unlock(&sdp->sd_quota_mutex);
 }
 
@@ -796,7 +798,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
        loc -= sizeof(q); /* gfs2_internal_read would've advanced the loc ptr */
        err = -EIO;
        be64_add_cpu(&q.qu_value, change);
-       if (be64_to_cpu(q.qu_value) < 0)
+       if (((s64)be64_to_cpu(q.qu_value)) < 0)
                q.qu_value = 0; /* Never go negative on quota usage */
        qd->qd_qb.qb_value = q.qu_value;
        if (fdq) {
@@ -1187,10 +1189,13 @@ int gfs2_quota_check(struct gfs2_inode *ip, kuid_t uid, kgid_t gid,
                        /* If no min_target specified or we don't meet
                         * min_target, return -EDQUOT */
                        if (!ap->min_target || ap->min_target > ap->allowed) {
-                               print_message(qd, "exceeded");
-                               quota_send_warning(qd->qd_id,
-                                                  sdp->sd_vfs->s_dev,
-                                                  QUOTA_NL_BHARDWARN);
+                               if (!test_and_set_bit(QDF_QMSG_QUIET,
+                                                     &qd->qd_flags)) {
+                                       print_message(qd, "exceeded");
+                                       quota_send_warning(qd->qd_id,
+                                                          sdp->sd_vfs->s_dev,
+                                                          QUOTA_NL_BHARDWARN);
+                               }
                                error = -EDQUOT;
                                break;
                        }
@@ -1533,32 +1538,34 @@ int gfs2_quotad(void *data)
        return 0;
 }
 
-static int gfs2_quota_get_xstate(struct super_block *sb,
-                                struct fs_quota_stat *fqs)
+static int gfs2_quota_get_state(struct super_block *sb, struct qc_state *state)
 {
        struct gfs2_sbd *sdp = sb->s_fs_info;
 
-       memset(fqs, 0, sizeof(struct fs_quota_stat));
-       fqs->qs_version = FS_QSTAT_VERSION;
+       memset(state, 0, sizeof(*state));
 
        switch (sdp->sd_args.ar_quota) {
        case GFS2_QUOTA_ON:
-               fqs->qs_flags |= (FS_QUOTA_UDQ_ENFD | FS_QUOTA_GDQ_ENFD);
+               state->s_state[USRQUOTA].flags |= QCI_LIMITS_ENFORCED;
+               state->s_state[GRPQUOTA].flags |= QCI_LIMITS_ENFORCED;
                /*FALLTHRU*/
        case GFS2_QUOTA_ACCOUNT:
-               fqs->qs_flags |= (FS_QUOTA_UDQ_ACCT | FS_QUOTA_GDQ_ACCT);
+               state->s_state[USRQUOTA].flags |= QCI_ACCT_ENABLED |
+                                                 QCI_SYSFILE;
+               state->s_state[GRPQUOTA].flags |= QCI_ACCT_ENABLED |
+                                                 QCI_SYSFILE;
                break;
        case GFS2_QUOTA_OFF:
                break;
        }
-
        if (sdp->sd_quota_inode) {
-               fqs->qs_uquota.qfs_ino = GFS2_I(sdp->sd_quota_inode)->i_no_addr;
-               fqs->qs_uquota.qfs_nblks = sdp->sd_quota_inode->i_blocks;
+               state->s_state[USRQUOTA].ino =
+                                       GFS2_I(sdp->sd_quota_inode)->i_no_addr;
+               state->s_state[USRQUOTA].blocks = sdp->sd_quota_inode->i_blocks;
        }
-       fqs->qs_uquota.qfs_nextents = 1; /* unsupported */
-       fqs->qs_gquota = fqs->qs_uquota; /* its the same inode in both cases */
-       fqs->qs_incoredqs = list_lru_count(&gfs2_qd_lru);
+       state->s_state[USRQUOTA].nextents = 1;  /* unsupported */
+       state->s_state[GRPQUOTA] = state->s_state[USRQUOTA];
+       state->s_incoredqs = list_lru_count(&gfs2_qd_lru);
        return 0;
 }
 
@@ -1685,6 +1692,8 @@ static int gfs2_set_dqblk(struct super_block *sb, struct kqid qid,
 
        /* Apply changes */
        error = gfs2_adjust_quota(ip, offset, 0, qd, fdq);
+       if (!error)
+               clear_bit(QDF_QMSG_QUIET, &qd->qd_flags);
 
        gfs2_trans_end(sdp);
 out_release:
@@ -1703,7 +1712,7 @@ out_put:
 
 const struct quotactl_ops gfs2_quotactl_ops = {
        .quota_sync     = gfs2_quota_sync,
-       .get_xstate     = gfs2_quota_get_xstate,
+       .get_state      = gfs2_quota_get_state,
        .get_dqblk      = gfs2_get_dqblk,
        .set_dqblk      = gfs2_set_dqblk,
 };