AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

quota: Inline inode_{incr,decr}_space() into callsites

Browse Source 
inode_incr_space() and inode_decr_space() have only two callsites.
Inline them there as that will make locking changes simpler.

Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2017-08-07 17:17:10 +02:00
parent 0ed60de34a
commit a478e522e3
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fs/quota/dquot.c
View File

@ -1595,29 +1595,6 @@ static qsize_t inode_get_rsv_space(struct inode *inode)
return ret; return ret;
} }
static void inode_incr_space(struct inode *inode, qsize_t number,
int reserve)
{
if (reserve) {
spin_lock(&inode->i_lock);
*inode_reserved_space(inode) += number;
spin_unlock(&inode->i_lock);
} else {
inode_add_bytes(inode, number);
}
}
static void inode_decr_space(struct inode *inode, qsize_t number, int reserve)
{
if (reserve) {
spin_lock(&inode->i_lock);
*inode_reserved_space(inode) -= number;
spin_unlock(&inode->i_lock);
} else {
inode_sub_bytes(inode, number);
}
}
/* /*
* This functions updates i_blocks+i_bytes fields and quota information * This functions updates i_blocks+i_bytes fields and quota information
* (together with appropriate checks). * (together with appropriate checks).
@ -1639,7 +1616,13 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
struct dquot **dquots; struct dquot **dquots;
if (!dquot_active(inode)) { if (!dquot_active(inode)) {
inode_incr_space(inode, number, reserve); if (reserve) {
spin_lock(&inode->i_lock);
*inode_reserved_space(inode) += number;
spin_unlock(&inode->i_lock);
} else {
inode_add_bytes(inode, number);
}
goto out; goto out;
} }
@ -1667,7 +1650,13 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
else else
dquot_incr_space(dquots[cnt], number); dquot_incr_space(dquots[cnt], number);
} }
inode_incr_space(inode, number, reserve); if (reserve) {
spin_lock(&inode->i_lock);
*inode_reserved_space(inode) += number;
spin_unlock(&inode->i_lock);
} else {
inode_add_bytes(inode, number);
}
spin_unlock(&dq_data_lock); spin_unlock(&dq_data_lock);
if (reserve) if (reserve)
@ -1805,7 +1794,13 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
int reserve = flags & DQUOT_SPACE_RESERVE, index; int reserve = flags & DQUOT_SPACE_RESERVE, index;
if (!dquot_active(inode)) { if (!dquot_active(inode)) {
inode_decr_space(inode, number, reserve); if (reserve) {
spin_lock(&inode->i_lock);
*inode_reserved_space(inode) -= number;
spin_unlock(&inode->i_lock);
} else {
inode_sub_bytes(inode, number);
}
return; return;
} }
@ -1826,7 +1821,13 @@ void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
else else
dquot_decr_space(dquots[cnt], number); dquot_decr_space(dquots[cnt], number);
} }
inode_decr_space(inode, number, reserve); if (reserve) {
spin_lock(&inode->i_lock);
*inode_reserved_space(inode) -= number;
spin_unlock(&inode->i_lock);
} else {
inode_sub_bytes(inode, number);
}
spin_unlock(&dq_data_lock); spin_unlock(&dq_data_lock);
if (reserve) if (reserve)