diff options
Diffstat (limited to 'include/linux/quotaops.h')
-rw-r--r-- | include/linux/quotaops.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 47e85682e118..9ce7f051a4ba 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h | |||
@@ -37,10 +37,10 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, | |||
37 | int warn, int reserve); | 37 | int warn, int reserve); |
38 | void __dquot_free_space(struct inode *inode, qsize_t number, int reserve); | 38 | void __dquot_free_space(struct inode *inode, qsize_t number, int reserve); |
39 | 39 | ||
40 | int dquot_alloc_inode(const struct inode *inode, qsize_t number); | 40 | int dquot_alloc_inode(const struct inode *inode); |
41 | 41 | ||
42 | int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); | 42 | int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); |
43 | int dquot_free_inode(const struct inode *inode, qsize_t number); | 43 | void dquot_free_inode(const struct inode *inode); |
44 | 44 | ||
45 | int dquot_transfer(struct inode *inode, qid_t *chid, unsigned long mask); | 45 | int dquot_transfer(struct inode *inode, qid_t *chid, unsigned long mask); |
46 | int dquot_commit(struct dquot *dquot); | 46 | int dquot_commit(struct dquot *dquot); |
@@ -148,22 +148,6 @@ static inline void vfs_dq_init(struct inode *inode) | |||
148 | inode->i_sb->dq_op->initialize(inode, -1); | 148 | inode->i_sb->dq_op->initialize(inode, -1); |
149 | } | 149 | } |
150 | 150 | ||
151 | static inline int vfs_dq_alloc_inode(struct inode *inode) | ||
152 | { | ||
153 | if (sb_any_quota_active(inode->i_sb)) { | ||
154 | vfs_dq_init(inode); | ||
155 | if (inode->i_sb->dq_op->alloc_inode(inode, 1) == NO_QUOTA) | ||
156 | return 1; | ||
157 | } | ||
158 | return 0; | ||
159 | } | ||
160 | |||
161 | static inline void vfs_dq_free_inode(struct inode *inode) | ||
162 | { | ||
163 | if (sb_any_quota_active(inode->i_sb)) | ||
164 | inode->i_sb->dq_op->free_inode(inode, 1); | ||
165 | } | ||
166 | |||
167 | /* Cannot be called inside a transaction */ | 151 | /* Cannot be called inside a transaction */ |
168 | static inline int vfs_dq_off(struct super_block *sb, int remount) | 152 | static inline int vfs_dq_off(struct super_block *sb, int remount) |
169 | { | 153 | { |
@@ -231,12 +215,12 @@ static inline void vfs_dq_drop(struct inode *inode) | |||
231 | { | 215 | { |
232 | } | 216 | } |
233 | 217 | ||
234 | static inline int vfs_dq_alloc_inode(struct inode *inode) | 218 | static inline int dquot_alloc_inode(const struct inode *inode) |
235 | { | 219 | { |
236 | return 0; | 220 | return 0; |
237 | } | 221 | } |
238 | 222 | ||
239 | static inline void vfs_dq_free_inode(struct inode *inode) | 223 | static inline void dquot_free_inode(const struct inode *inode) |
240 | { | 224 | { |
241 | } | 225 | } |
242 | 226 | ||