summaryrefslogtreecommitdiff
path: root/fs/quota
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2010-05-16 09:00:00 -0400
committerTheodore Ts'o <tytso@mit.edu>2010-05-16 09:00:00 -0400
commit56246f9ae4cfa95b460f9dfbcfb1b772d85db046 (patch)
tree2a11530806fd384c7a482d7d05f7966af773fef2 /fs/quota
parent84061e07c5fbbbf9dc8aef8fb750fc3a2dfc31f3 (diff)
downloadlinux-3.10-56246f9ae4cfa95b460f9dfbcfb1b772d85db046.tar.gz
linux-3.10-56246f9ae4cfa95b460f9dfbcfb1b772d85db046.tar.bz2
linux-3.10-56246f9ae4cfa95b460f9dfbcfb1b772d85db046.zip
quota: use flags interface for dquot alloc/free space
Switch __dquot_alloc_space and __dquot_free_space to take flags to indicate whether to warn and/or to reserve (or free reserve). This is slightly more readable at the callpoints, and makes it cleaner to add a "nofail" option in the next patch. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/quota')
-rw-r--r--fs/quota/dquot.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 788b5802a7c..8c40c07797a 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)
/*
* This operation can block, but only after everything is updated
*/
-int __dquot_alloc_space(struct inode *inode, qsize_t number,
- int warn, int reserve)
+int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
{
int cnt, ret = 0;
char warntype[MAXQUOTAS];
+ int warn = flags & DQUOT_SPACE_WARN;
+ int reserve = flags & DQUOT_SPACE_RESERVE;
/*
* First test before acquiring mutex - solves deadlocks when we
@@ -1612,10 +1613,11 @@ EXPORT_SYMBOL(dquot_claim_space_nodirty);
/*
* This operation can block, but only after everything is updated
*/
-void __dquot_free_space(struct inode *inode, qsize_t number, int reserve)
+void __dquot_free_space(struct inode *inode, qsize_t number, int flags)
{
unsigned int cnt;
char warntype[MAXQUOTAS];
+ int reserve = flags & DQUOT_SPACE_RESERVE;
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */