Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[linux-block.git] / fs / quota / quota_v2.c

diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 02751ec695c596eb68fc558ab0514c39ab0943c8..9cb10d7197f70c1a74b01b927f0cbd14e40a84e2 100644 (file)
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -117,16 +117,17 @@ 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);
-       info->dqi_flags = le32_to_cpu(dinfo.dqi_flags);
+       /* No flags currently supported */
+       info->dqi_flags = 0;
        qinfo->dqi_sb = sb;
        qinfo->dqi_type = type;
        qinfo->dqi_blocks = le32_to_cpu(dinfo.dqi_blocks);
@@ -157,7 +158,8 @@ static int v2_write_file_info(struct super_block *sb, int type)
        info->dqi_flags &= ~DQF_INFO_DIRTY;
        dinfo.dqi_bgrace = cpu_to_le32(info->dqi_bgrace);
        dinfo.dqi_igrace = cpu_to_le32(info->dqi_igrace);
-       dinfo.dqi_flags = cpu_to_le32(info->dqi_flags & DQF_MASK);
+       /* No flags currently supported */
+       dinfo.dqi_flags = cpu_to_le32(0);
        spin_unlock(&dq_data_lock);
        dinfo.dqi_blocks = cpu_to_le32(qinfo->dqi_blocks);
        dinfo.dqi_free_blk = cpu_to_le32(qinfo->dqi_free_blk);