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

Commit 83b7094a authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e5c8725

fs/ocfs2/quota_local.c

+2 −2
Original line number Diff line number Diff line
@@ -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"

fs/quota/dquot.c

+4 −14
Original line number Diff line number Diff line
@@ -2380,16 +2380,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)

{
@@ -2439,13 +2429,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);

fs/quota/quota_v1.c

+2 −2
Original line number Diff line number Diff line
@@ -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 =

fs/quota/quota_v2.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

include/linux/quota.h

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,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;

};