quota: Store maximum space limit in bytes

commit b10a08194c2b615955dfab2300331a90ae9344c7 upstream.

Currently maximum space limit quota format supports is in blocks however
since we store space limits in bytes, this is somewhat confusing. So
store the maximum limit in bytes as well. Also rename the field to match
the new unit and related inode field to match the new naming scheme.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index 10b653930ee26aa97320e827d01499e19ffe2b16..465223b7592ed07a02cf373119336a75690a9926 100644 (file)
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
@@ -701,8 +701,8 @@ static int ocfs2_local_read_info(struct super_block *sb, int type)
        /* We don't need the lock and we have to acquire quota file locks
         * which will later depend on this lock */
        mutex_unlock(&sb_dqopt(sb)->dqio_mutex);
-       info->dqi_maxblimit = 0x7fffffffffffffffLL;
-       info->dqi_maxilimit = 0x7fffffffffffffffLL;
+       info->dqi_max_spc_limit = 0x7fffffffffffffffLL;
+       info->dqi_max_ino_limit = 0x7fffffffffffffffLL;
        oinfo = kmalloc(sizeof(struct ocfs2_mem_dqinfo), GFP_NOFS);
        if (!oinfo) {
                mlog(ML_ERROR, "failed to allocate memory for ocfs2 quota"

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 69df5b239844f9395f38d2e3acb8f93f34142c0a..ca035a2fce810e67dce83c8199e5ec2b21f80a99 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2385,16 +2385,6 @@ out:
 }
 EXPORT_SYMBOL(dquot_quota_on_mount);
 
-static inline qsize_t qbtos(qsize_t blocks)
-{
-       return blocks << QIF_DQBLKSIZE_BITS;
-}
-
-static inline qsize_t stoqb(qsize_t space)
-{
-       return (space + QIF_DQBLKSIZE - 1) >> QIF_DQBLKSIZE_BITS;
-}
-
 /* Generic routine for getting common part of quota structure */
 static void do_get_dqblk(struct dquot *dquot, struct qc_dqblk *di)
 {
@@ -2444,13 +2434,13 @@ static int do_set_dqblk(struct dquot *dquot, struct qc_dqblk *di)
                return -EINVAL;
 
        if (((di->d_fieldmask & QC_SPC_SOFT) &&
-            stoqb(di->d_spc_softlimit) > dqi->dqi_maxblimit) ||
+            di->d_spc_softlimit > dqi->dqi_max_spc_limit) ||
            ((di->d_fieldmask & QC_SPC_HARD) &&
-            stoqb(di->d_spc_hardlimit) > dqi->dqi_maxblimit) ||
+            di->d_spc_hardlimit > dqi->dqi_max_spc_limit) ||
            ((di->d_fieldmask & QC_INO_SOFT) &&
-            (di->d_ino_softlimit > dqi->dqi_maxilimit)) ||
+            (di->d_ino_softlimit > dqi->dqi_max_ino_limit)) ||
            ((di->d_fieldmask & QC_INO_HARD) &&
-            (di->d_ino_hardlimit > dqi->dqi_maxilimit)))
+            (di->d_ino_hardlimit > dqi->dqi_max_ino_limit)))
                return -ERANGE;
 
        spin_lock(&dq_data_lock);

diff --git a/fs/quota/quota_v1.c b/fs/quota/quota_v1.c
index 469c6848b322dd9f6b8aab6933b9cc75d8ee18c9..8fe79beced5cc05c77ad0d536fe017beeb4a2f9e 100644 (file)
--- a/fs/quota/quota_v1.c
+++ b/fs/quota/quota_v1.c
@@ -169,8 +169,8 @@ static int v1_read_file_info(struct super_block *sb, int type)
        }
        ret = 0;
        /* limits are stored as unsigned 32-bit data */
-       dqopt->info[type].dqi_maxblimit = 0xffffffff;
-       dqopt->info[type].dqi_maxilimit = 0xffffffff;
+       dqopt->info[type].dqi_max_spc_limit = 0xffffffffULL << QUOTABLOCK_BITS;
+       dqopt->info[type].dqi_max_ino_limit = 0xffffffff;
        dqopt->info[type].dqi_igrace =
                        dqblk.dqb_itime ? dqblk.dqb_itime : MAX_IQ_TIME;
        dqopt->info[type].dqi_bgrace =

diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 02751ec695c596eb68fc558ab0514c39ab0943c8..d1a8054bba9a3d9bb253ce5e6fe7d7f7a282f955 100644 (file)
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -117,12 +117,12 @@ static int v2_read_file_info(struct super_block *sb, int type)
        qinfo = info->dqi_priv;
        if (version == 0) {
                /* limits are stored as unsigned 32-bit data */
-               info->dqi_maxblimit = 0xffffffff;
-               info->dqi_maxilimit = 0xffffffff;
+               info->dqi_max_spc_limit = 0xffffffffULL << QUOTABLOCK_BITS;
+               info->dqi_max_ino_limit = 0xffffffff;
        } else {
-               /* used space is stored as unsigned 64-bit value */
-               info->dqi_maxblimit = 0xffffffffffffffffULL;    /* 2^64-1 */
-               info->dqi_maxilimit = 0xffffffffffffffffULL;
+               /* used space is stored as unsigned 64-bit value in bytes */
+               info->dqi_max_spc_limit = 0xffffffffffffffffULL; /* 2^64-1 */
+               info->dqi_max_ino_limit = 0xffffffffffffffffULL;
        }
        info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
        info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);

diff --git a/include/linux/quota.h b/include/linux/quota.h
index 097d7eb2441e529f139822b6bf4fe5031dc5e710..b86df497aba3a7e8f93f3f1ac0c6de6746f1545a 100644 (file)
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -216,8 +216,8 @@ struct mem_dqinfo {
        unsigned long dqi_flags;
        unsigned int dqi_bgrace;
        unsigned int dqi_igrace;
-       qsize_t dqi_maxblimit;
-       qsize_t dqi_maxilimit;
+       qsize_t dqi_max_spc_limit;
+       qsize_t dqi_max_ino_limit;
        void *dqi_priv;
 };