aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/quotaops.h
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2010-02-09 11:53:36 -0500
committerJan Kara <jack@suse.cz>2010-03-04 18:20:21 -0500
commitc469070aea5a0ada45a836937c776fd3083dae2b (patch)
tree8c36117b34aba28a73c2fe4e03c7e89c2f43aef3 /include/linux/quotaops.h
parentc7e8d4d6dceeb6fd236991f590d3fa6f97c59874 (diff)
quota: manage reserved space when quota is not active [v2]
Since we implemented generic reserved space management interface, then it is possible to account reserved space even when quota is not active (similar to i_blocks/i_bytes). Without this patch following testcase result in massive comlain from WARN_ON in dquot_claim_space() TEST_CASE: mount /dev/sdb /mnt -oquota dd if=/dev/zero of=/mnt/test bs=1M count=1 quotaon /mnt # fs_reserved_spave == 1Mb # quota_reserved_space == 0, because quota was disabled dd if=/dev/zero of=/mnt/test seek=1 bs=1M count=1 # fs_reserved_spave == 2Mb # quota_reserved_space == 1Mb sync # ->dquot_claim_space() -> WARN_ON Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'include/linux/quotaops.h')
-rw-r--r--include/linux/quotaops.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 3ebb23153640..a529d86e7e73 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -26,6 +26,10 @@ static inline void writeout_quota_sb(struct super_block *sb, int type)
26 sb->s_qcop->quota_sync(sb, type); 26 sb->s_qcop->quota_sync(sb, type);
27} 27}
28 28
29void inode_add_rsv_space(struct inode *inode, qsize_t number);
30void inode_claim_rsv_space(struct inode *inode, qsize_t number);
31void inode_sub_rsv_space(struct inode *inode, qsize_t number);
32
29int dquot_initialize(struct inode *inode, int type); 33int dquot_initialize(struct inode *inode, int type);
30int dquot_drop(struct inode *inode); 34int dquot_drop(struct inode *inode);
31struct dquot *dqget(struct super_block *sb, unsigned int id, int type); 35struct dquot *dqget(struct super_block *sb, unsigned int id, int type);
@@ -42,7 +46,6 @@ int dquot_alloc_inode(const struct inode *inode, qsize_t number);
42int dquot_reserve_space(struct inode *inode, qsize_t number, int prealloc); 46int dquot_reserve_space(struct inode *inode, qsize_t number, int prealloc);
43int dquot_claim_space(struct inode *inode, qsize_t number); 47int dquot_claim_space(struct inode *inode, qsize_t number);
44void dquot_release_reserved_space(struct inode *inode, qsize_t number); 48void dquot_release_reserved_space(struct inode *inode, qsize_t number);
45qsize_t dquot_get_reserved_space(struct inode *inode);
46 49
47int dquot_free_space(struct inode *inode, qsize_t number); 50int dquot_free_space(struct inode *inode, qsize_t number);
48int dquot_free_inode(const struct inode *inode, qsize_t number); 51int dquot_free_inode(const struct inode *inode, qsize_t number);
@@ -199,6 +202,8 @@ static inline int vfs_dq_reserve_space(struct inode *inode, qsize_t nr)
199 if (inode->i_sb->dq_op->reserve_space(inode, nr, 0) == NO_QUOTA) 202 if (inode->i_sb->dq_op->reserve_space(inode, nr, 0) == NO_QUOTA)
200 return 1; 203 return 1;
201 } 204 }
205 else
206 inode_add_rsv_space(inode, nr);
202 return 0; 207 return 0;
203} 208}
204 209
@@ -221,7 +226,7 @@ static inline int vfs_dq_claim_space(struct inode *inode, qsize_t nr)
221 if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA) 226 if (inode->i_sb->dq_op->claim_space(inode, nr) == NO_QUOTA)
222 return 1; 227 return 1;
223 } else 228 } else
224 inode_add_bytes(inode, nr); 229 inode_claim_rsv_space(inode, nr);
225 230
226 mark_inode_dirty(inode); 231 mark_inode_dirty(inode);
227 return 0; 232 return 0;
@@ -235,6 +240,8 @@ void vfs_dq_release_reservation_space(struct inode *inode, qsize_t nr)
235{ 240{
236 if (sb_any_quota_active(inode->i_sb)) 241 if (sb_any_quota_active(inode->i_sb))
237 inode->i_sb->dq_op->release_rsv(inode, nr); 242 inode->i_sb->dq_op->release_rsv(inode, nr);
243 else
244 inode_sub_rsv_space(inode, nr);
238} 245}
239 246
240static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr) 247static inline void vfs_dq_free_space_nodirty(struct inode *inode, qsize_t nr)