Commit c922bbc8 authored Feb 06, 2012 by Mitsuo Hayasaka Committed by Ben Myers Feb 21, 2012

xfs: make inode quota check more general



The xfs checks quota when reserving disk blocks and inodes. In the block
reservation, it checks if the total number of blocks including current
usage and new reservation exceed quota. In the inode reservation,
it checks using the total number of inodes including only current usage
without new reservation. However, this inode quota check works well
since the caller of xfs_trans_dquot() always sets the argument of the
number of new inode reservation to 1 or 0 and inode is reserved one by
one in current xfs.

To make it more general, this patch changes it to the same way as the
block quota check.

Signed-off-by: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
Cc: Ben Myers <bpm@sgi.com>
Cc: Alex Elder <elder@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ben Myers <bpm@sgi.com>

parent 20f12d8a

fs/xfs/xfs_trans_dquot.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -677,11 +677,13 @@ xfs_trans_dqresv(
	if (!softlimit)		if (!softlimit)
	softlimit = q->qi_isoftlimit;		softlimit = q->qi_isoftlimit;

	if (hardlimit > 0ULL && count >= hardlimit) {		if (hardlimit > 0ULL &&
			hardlimit < ninos + count) {
	xfs_quota_warn(mp, dqp, QUOTA_NL_IHARDWARN);		xfs_quota_warn(mp, dqp, QUOTA_NL_IHARDWARN);
	goto error_return;		goto error_return;
	}		}
	if (softlimit > 0ULL && count >= softlimit) {		if (softlimit > 0ULL &&
			softlimit < ninos + count) {
	if ((timer != 0 && get_seconds() > timer) \|\|		if ((timer != 0 && get_seconds() > timer) \|\|
	(warns != 0 && warns >= warnlimit)) {		(warns != 0 && warns >= warnlimit)) {
	xfs_quota_warn(mp, dqp,		xfs_quota_warn(mp, dqp,

Admin message