Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c119c5b9 authored by Jan Kara's avatar Jan Kara
Browse files

quota: Don't store flags for v2 quota format 



Currently, v2 quota format blindly stored flags from in-memory dqinfo on
disk, although there are no flags supported. Since it is stupid to store
flags which have no effect, just store 0 unconditionally and don't
bother loading it from disk.

Note that userspace could have stored some flags there via Q_SETINFO
quotactl and then later read them (although flags have no effect) but
I'm pretty sure noone does that (most definitely quota-tools don't and
quota interface doesn't have too much other users).

Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent c38fda3f

fs/quota/quota_v2.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -126,7 +126,8 @@ static int v2_read_file_info(struct super_block *sb, int type) 
	}

	}

	info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);

	info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);

	info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);

	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_sb = sb;

	qinfo->dqi_type = type;

	qinfo->dqi_type = type;

	qinfo->dqi_blocks = le32_to_cpu(dinfo.dqi_blocks);

	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;

	info->dqi_flags &= ~DQF_INFO_DIRTY;

	dinfo.dqi_bgrace = cpu_to_le32(info->dqi_bgrace);

	dinfo.dqi_bgrace = cpu_to_le32(info->dqi_bgrace);

	dinfo.dqi_igrace = cpu_to_le32(info->dqi_igrace);

	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);

	spin_unlock(&dq_data_lock);

	dinfo.dqi_blocks = cpu_to_le32(qinfo->dqi_blocks);

	dinfo.dqi_blocks = cpu_to_le32(qinfo->dqi_blocks);

	dinfo.dqi_free_blk = cpu_to_le32(qinfo->dqi_free_blk);

	dinfo.dqi_free_blk = cpu_to_le32(qinfo->dqi_free_blk);