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

quota: Inline dquot_[re]claim_reserved_space() into callsite

dquot_claim_reserved_space() and dquot_reclaim_reserved_space() have
only a single callsite. Inline them there.

Signed-off-by: Jan Kara <jack@suse.cz>

Jan Kara 3ab167d2 a478e522

+16 -25
+16 -25
fs/quota/dquot.c
··· 1088 1088 dquot->dq_dqb.dqb_rsvspace += number; 1089 1089 } 1090 1090 1091 - /* 1092 - * Claim reserved quota space 1093 - */ 1094 - static void dquot_claim_reserved_space(struct dquot *dquot, qsize_t number) 1095 - { 1096 - if (dquot->dq_dqb.dqb_rsvspace < number) { 1097 - WARN_ON_ONCE(1); 1098 - number = dquot->dq_dqb.dqb_rsvspace; 1099 - } 1100 - dquot->dq_dqb.dqb_curspace += number; 1101 - dquot->dq_dqb.dqb_rsvspace -= number; 1102 - } 1103 - 1104 - static void dquot_reclaim_reserved_space(struct dquot *dquot, qsize_t number) 1105 - { 1106 - if (WARN_ON_ONCE(dquot->dq_dqb.dqb_curspace < number)) 1107 - number = dquot->dq_dqb.dqb_curspace; 1108 - dquot->dq_dqb.dqb_rsvspace += number; 1109 - dquot->dq_dqb.dqb_curspace -= number; 1110 - } 1111 - 1112 1091 static inline 1113 1092 void dquot_free_reserved_space(struct dquot *dquot, qsize_t number) 1114 1093 { ··· 1711 1732 spin_lock(&dq_data_lock); 1712 1733 /* Claim reserved quotas to allocated quotas */ 1713 1734 for (cnt = 0; cnt < MAXQUOTAS; cnt++) { 1714 - if (dquots[cnt]) 1715 - dquot_claim_reserved_space(dquots[cnt], number); 1735 + if (dquots[cnt]) { 1736 + struct dquot *dquot = dquots[cnt]; 1737 + 1738 + if (WARN_ON_ONCE(dquot->dq_dqb.dqb_rsvspace < number)) 1739 + number = dquot->dq_dqb.dqb_rsvspace; 1740 + dquot->dq_dqb.dqb_curspace += number; 1741 + dquot->dq_dqb.dqb_rsvspace -= number; 1742 + } 1716 1743 } 1717 1744 /* Update inode bytes */ 1718 1745 spin_lock(&inode->i_lock); ··· 1753 1768 spin_lock(&dq_data_lock); 1754 1769 /* Claim reserved quotas to allocated quotas */ 1755 1770 for (cnt = 0; cnt < MAXQUOTAS; cnt++) { 1756 - if (dquots[cnt]) 1757 - dquot_reclaim_reserved_space(dquots[cnt], number); 1771 + if (dquots[cnt]) { 1772 + struct dquot *dquot = dquots[cnt]; 1773 + 1774 + if (WARN_ON_ONCE(dquot->dq_dqb.dqb_curspace < number)) 1775 + number = dquot->dq_dqb.dqb_curspace; 1776 + dquot->dq_dqb.dqb_rsvspace += number; 1777 + dquot->dq_dqb.dqb_curspace -= number; 1778 + } 1758 1779 } 1759 1780 /* Update inode bytes */ 1760 1781 spin_lock(&inode->i_lock);