diff options
Diffstat (limited to 'fs/quota/dquot.c')
-rw-r--r-- | fs/quota/dquot.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 788b5802a7ce..8c40c07797ad 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c | |||
@@ -1488,11 +1488,12 @@ static void inode_decr_space(struct inode *inode, qsize_t number, int reserve) | |||
1488 | /* | 1488 | /* |
1489 | * This operation can block, but only after everything is updated | 1489 | * This operation can block, but only after everything is updated |
1490 | */ | 1490 | */ |
1491 | int __dquot_alloc_space(struct inode *inode, qsize_t number, | 1491 | int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) |
1492 | int warn, int reserve) | ||
1493 | { | 1492 | { |
1494 | int cnt, ret = 0; | 1493 | int cnt, ret = 0; |
1495 | char warntype[MAXQUOTAS]; | 1494 | char warntype[MAXQUOTAS]; |
1495 | int warn = flags & DQUOT_SPACE_WARN; | ||
1496 | int reserve = flags & DQUOT_SPACE_RESERVE; | ||
1496 | 1497 | ||
1497 | /* | 1498 | /* |
1498 | * First test before acquiring mutex - solves deadlocks when we | 1499 | * First test before acquiring mutex - solves deadlocks when we |
@@ -1612,10 +1613,11 @@ EXPORT_SYMBOL(dquot_claim_space_nodirty); | |||
1612 | /* | 1613 | /* |
1613 | * This operation can block, but only after everything is updated | 1614 | * This operation can block, but only after everything is updated |
1614 | */ | 1615 | */ |
1615 | void __dquot_free_space(struct inode *inode, qsize_t number, int reserve) | 1616 | void __dquot_free_space(struct inode *inode, qsize_t number, int flags) |
1616 | { | 1617 | { |
1617 | unsigned int cnt; | 1618 | unsigned int cnt; |
1618 | char warntype[MAXQUOTAS]; | 1619 | char warntype[MAXQUOTAS]; |
1620 | int reserve = flags & DQUOT_SPACE_RESERVE; | ||
1619 | 1621 | ||
1620 | /* First test before acquiring mutex - solves deadlocks when we | 1622 | /* First test before acquiring mutex - solves deadlocks when we |
1621 | * re-enter the quota code and are already holding the mutex */ | 1623 | * re-enter the quota code and are already holding the mutex */ |