quota: Store maximum space limit in bytes

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>

diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index 55f832f553cb85290a1dc11ff7d5724c240edc65..89c0b26208144132585f30b0c29a350c83f9f196 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 b47d0c17ea6ff0e379f78d5c74402ffc5aec6385..0ccd4ba3a2467f6783a396686b5ae20266ba515b 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2465,16 +2465,6 @@ out_err:
        return ret;
 }
 
-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)
 {
@@ -2524,13 +2514,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 54cac436ac72629cd6e0969aa619495631d91768..9cb10d7197f70c1a74b01b927f0cbd14e40a84e2 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 0938159d65c85d36cbb3090088f44ac5c5cbc460..d534e8ed308a1a116ae968ed78d98d9e183bb00a 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;
 };