Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

Jan Kara a478e522 0ed60de3

+28 -27
+28 -27
fs/quota/dquot.c
··· 1595 1595 return ret; 1596 1596 } 1597 1597 1598 - static void inode_incr_space(struct inode *inode, qsize_t number, 1599 - int reserve) 1600 - { 1601 - if (reserve) { 1602 - spin_lock(&inode->i_lock); 1603 - *inode_reserved_space(inode) += number; 1604 - spin_unlock(&inode->i_lock); 1605 - } else { 1606 - inode_add_bytes(inode, number); 1607 - } 1608 - } 1609 - 1610 - static void inode_decr_space(struct inode *inode, qsize_t number, int reserve) 1611 - { 1612 - if (reserve) { 1613 - spin_lock(&inode->i_lock); 1614 - *inode_reserved_space(inode) -= number; 1615 - spin_unlock(&inode->i_lock); 1616 - } else { 1617 - inode_sub_bytes(inode, number); 1618 - } 1619 - } 1620 - 1621 1598 /* 1622 1599 * This functions updates i_blocks+i_bytes fields and quota information 1623 1600 * (together with appropriate checks). ··· 1616 1639 struct dquot **dquots; 1617 1640 1618 1641 if (!dquot_active(inode)) { 1619 - inode_incr_space(inode, number, reserve); 1642 + if (reserve) { 1643 + spin_lock(&inode->i_lock); 1644 + *inode_reserved_space(inode) += number; 1645 + spin_unlock(&inode->i_lock); 1646 + } else { 1647 + inode_add_bytes(inode, number); 1648 + } 1620 1649 goto out; 1621 1650 } 1622 1651 ··· 1650 1667 else 1651 1668 dquot_incr_space(dquots[cnt], number); 1652 1669 } 1653 - inode_incr_space(inode, number, reserve); 1670 + if (reserve) { 1671 + spin_lock(&inode->i_lock); 1672 + *inode_reserved_space(inode) += number; 1673 + spin_unlock(&inode->i_lock); 1674 + } else { 1675 + inode_add_bytes(inode, number); 1676 + } 1654 1677 spin_unlock(&dq_data_lock); 1655 1678 1656 1679 if (reserve) ··· 1794 1805 int reserve = flags & DQUOT_SPACE_RESERVE, index; 1795 1806 1796 1807 if (!dquot_active(inode)) { 1797 - inode_decr_space(inode, number, reserve); 1808 + if (reserve) { 1809 + spin_lock(&inode->i_lock); 1810 + *inode_reserved_space(inode) -= number; 1811 + spin_unlock(&inode->i_lock); 1812 + } else { 1813 + inode_sub_bytes(inode, number); 1814 + } 1798 1815 return; 1799 1816 } 1800 1817 ··· 1821 1826 else 1822 1827 dquot_decr_space(dquots[cnt], number); 1823 1828 } 1824 - inode_decr_space(inode, number, reserve); 1829 + if (reserve) { 1830 + spin_lock(&inode->i_lock); 1831 + *inode_reserved_space(inode) -= number; 1832 + spin_unlock(&inode->i_lock); 1833 + } else { 1834 + inode_sub_bytes(inode, number); 1835 + } 1825 1836 spin_unlock(&dq_data_lock); 1826 1837 1827 1838 if (reserve)