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

Commit c469070a authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Jan Kara
Browse files

quota: manage reserved space when quota is not active [v2] 



Since we implemented generic reserved space management interface,
then it is possible to account reserved space even when quota
is not active (similar to i_blocks/i_bytes).

Without this patch following testcase result in massive comlain from
WARN_ON in dquot_claim_space()

TEST_CASE:
mount /dev/sdb /mnt -oquota
dd if=/dev/zero of=/mnt/test bs=1M count=1
quotaon /mnt
# fs_reserved_spave == 1Mb
# quota_reserved_space == 0, because quota was disabled
dd if=/dev/zero of=/mnt/test seek=1 bs=1M count=1
# fs_reserved_spave == 2Mb
# quota_reserved_space == 1Mb
sync  # ->dquot_claim_space() -> WARN_ON

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent c7e8d4d6

fs/quota/dquot.c

+6 −4
Original line number Diff line number Diff line
@@ -1354,28 +1354,30 @@ static qsize_t *inode_reserved_space(struct inode * inode) 
	return inode->i_sb->dq_op->get_reserved_space(inode);

}



static void inode_add_rsv_space(struct inode *inode, qsize_t number)

void inode_add_rsv_space(struct inode *inode, qsize_t number)

{

	spin_lock(&inode->i_lock);

	*inode_reserved_space(inode) += number;

	spin_unlock(&inode->i_lock);

}

EXPORT_SYMBOL(inode_add_rsv_space);





static void inode_claim_rsv_space(struct inode *inode, qsize_t number)

void inode_claim_rsv_space(struct inode *inode, qsize_t number)

{

	spin_lock(&inode->i_lock);

	*inode_reserved_space(inode) -= number;

	__inode_add_bytes(inode, number);

	spin_unlock(&inode->i_lock);

}

EXPORT_SYMBOL(inode_claim_rsv_space);



static void inode_sub_rsv_space(struct inode *inode, qsize_t number)

void inode_sub_rsv_space(struct inode *inode, qsize_t number)

{

	spin_lock(&inode->i_lock);

	*inode_reserved_space(inode) -= number;

	spin_unlock(&inode->i_lock);

}

EXPORT_SYMBOL(inode_sub_rsv_space);



static qsize_t inode_get_rsv_space(struct inode *inode)

{

include/linux/quotaops.h

+9 −2
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ static inline void writeout_quota_sb(struct super_block *sb, int type) 
		sb->s_qcop->quota_sync(sb, type);

}



void inode_add_rsv_space(struct inode *inode, qsize_t number);

void inode_claim_rsv_space(struct inode *inode, qsize_t number);

void inode_sub_rsv_space(struct inode *inode, qsize_t number);



int dquot_initialize(struct inode *inode, int type);

int dquot_drop(struct inode *inode);

struct dquot *dqget(struct super_block *sb, unsigned int id, int type);
@@ -42,7 +46,6 @@ int dquot_alloc_inode(const struct inode *inode, qsize_t number); 
int dquot_reserve_space(struct inode *inode, qsize_t number, int prealloc);

int dquot_claim_space(struct inode *inode, qsize_t number);

void dquot_release_reserved_space(struct inode *inode, qsize_t number);

qsize_t dquot_get_reserved_space(struct inode *inode);



int dquot_free_space(struct inode *inode, qsize_t number);

int dquot_free_inode(const struct inode *inode, qsize_t number);
@@ -199,6 +202,8 @@ static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr) 
		if (inode->i_sb->dq_op->reserve_space(inode, nr, 0) == NO_QUOTA)

			return 1;

	}

	else

		inode_add_rsv_space(inode, nr);

	return 0;

}
@@ -221,7 +226,7 @@ static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr) 
		if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA)

			return 1;

	} else

		inode_add_bytes(inode, nr);

		inode_claim_rsv_space(inode, nr);



	mark_inode_dirty(inode);

	return 0;
@@ -235,6 +240,8 @@ void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr) 
{

	if (sb_any_quota_active(inode->i_sb))

		inode->i_sb->dq_op->release_rsv(inode, nr);

	else

		inode_sub_rsv_space(inode, nr);

}



static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr)