aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/quotaops.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2010-05-19 07:16:41 -0400
committerJan Kara <jack@suse.cz>2010-05-24 08:06:40 -0400
commit0f0dd62fddcbd0f6830ed8ef3d3426ccc46b9250 (patch)
tree295ac31b109f78873cb191867603943d8562ead0 /include/linux/quotaops.h
parentc79d967de3741ceb60c5bbbf1b6f97eab9a89838 (diff)
quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
Instead of having wrappers in the VFS namespace export the dquot_suspend and dquot_resume helpers directly. Also rename vfs_quota_disable to dquot_disable while we're at it. [Jan Kara: Moved dquot_suspend to quotaops.h and made it inline] Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'include/linux/quotaops.h')
-rw-r--r--include/linux/quotaops.h31
1 files changed, 24 insertions, 7 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h
index 370abb1e99c..811529241e3 100644
--- a/include/linux/quotaops.h
+++ b/include/linux/quotaops.h
@@ -50,6 +50,14 @@ int dquot_alloc_inode(const struct inode *inode);
50int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); 50int dquot_claim_space_nodirty(struct inode *inode, qsize_t number);
51void dquot_free_inode(const struct inode *inode); 51void dquot_free_inode(const struct inode *inode);
52 52
53int dquot_disable(struct super_block *sb, int type, unsigned int flags);
54/* Suspend quotas on remount RO */
55static inline int dquot_suspend(struct super_block *sb, int type)
56{
57 return dquot_disable(sb, type, DQUOT_SUSPENDED);
58}
59int dquot_resume(struct super_block *sb, int type);
60
53int dquot_commit(struct dquot *dquot); 61int dquot_commit(struct dquot *dquot);
54int dquot_acquire(struct dquot *dquot); 62int dquot_acquire(struct dquot *dquot);
55int dquot_release(struct dquot *dquot); 63int dquot_release(struct dquot *dquot);
@@ -67,7 +75,6 @@ int vfs_quota_on_path(struct super_block *sb, int type, int format_id,
67int vfs_quota_on_mount(struct super_block *sb, char *qf_name, 75int vfs_quota_on_mount(struct super_block *sb, char *qf_name,
68 int format_id, int type); 76 int format_id, int type);
69int vfs_quota_off(struct super_block *sb, int type, int remount); 77int vfs_quota_off(struct super_block *sb, int type, int remount);
70int vfs_quota_disable(struct super_block *sb, int type, unsigned int flags);
71int vfs_quota_sync(struct super_block *sb, int type, int wait); 78int vfs_quota_sync(struct super_block *sb, int type, int wait);
72int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); 79int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
73int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); 80int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii);
@@ -78,7 +85,6 @@ int vfs_set_dqblk(struct super_block *sb, int type, qid_t id,
78 85
79int __dquot_transfer(struct inode *inode, struct dquot **transfer_to); 86int __dquot_transfer(struct inode *inode, struct dquot **transfer_to);
80int dquot_transfer(struct inode *inode, struct iattr *iattr); 87int dquot_transfer(struct inode *inode, struct iattr *iattr);
81int vfs_dq_quota_on_remount(struct super_block *sb);
82 88
83static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type) 89static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type)
84{ 90{
@@ -231,11 +237,6 @@ static inline int vfs_dq_off(struct super_block *sb, int remount)
231 return 0; 237 return 0;
232} 238}
233 239
234static inline int vfs_dq_quota_on_remount(struct super_block *sb)
235{
236 return 0;
237}
238
239static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) 240static inline int dquot_transfer(struct inode *inode, struct iattr *iattr)
240{ 241{
241 return 0; 242 return 0;
@@ -262,6 +263,22 @@ static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
262 return 0; 263 return 0;
263} 264}
264 265
266static inline int dquot_disable(struct super_block *sb, int type,
267 unsigned int flags)
268{
269 return 0;
270}
271
272static inline int dquot_suspend(struct super_block *sb, int type)
273{
274 return 0;
275}
276
277static inline int dquot_resume(struct super_block *sb, int type)
278{
279 return 0;
280}
281
265#define dquot_file_open generic_file_open 282#define dquot_file_open generic_file_open
266 283
267#endif /* CONFIG_QUOTA */ 284#endif /* CONFIG_QUOTA */