diff options
Diffstat (limited to 'fs/quota/dquot.c')
-rw-r--r-- | fs/quota/dquot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 8c40c07797ad..df6832ec17c3 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c | |||
@@ -1494,6 +1494,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) | |||
1494 | char warntype[MAXQUOTAS]; | 1494 | char warntype[MAXQUOTAS]; |
1495 | int warn = flags & DQUOT_SPACE_WARN; | 1495 | int warn = flags & DQUOT_SPACE_WARN; |
1496 | int reserve = flags & DQUOT_SPACE_RESERVE; | 1496 | int reserve = flags & DQUOT_SPACE_RESERVE; |
1497 | int nofail = flags & DQUOT_SPACE_NOFAIL; | ||
1497 | 1498 | ||
1498 | /* | 1499 | /* |
1499 | * First test before acquiring mutex - solves deadlocks when we | 1500 | * First test before acquiring mutex - solves deadlocks when we |
@@ -1514,7 +1515,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) | |||
1514 | continue; | 1515 | continue; |
1515 | ret = check_bdq(inode->i_dquot[cnt], number, !warn, | 1516 | ret = check_bdq(inode->i_dquot[cnt], number, !warn, |
1516 | warntype+cnt); | 1517 | warntype+cnt); |
1517 | if (ret) { | 1518 | if (ret && !nofail) { |
1518 | spin_unlock(&dq_data_lock); | 1519 | spin_unlock(&dq_data_lock); |
1519 | goto out_flush_warn; | 1520 | goto out_flush_warn; |
1520 | } | 1521 | } |