diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-05-19 07:16:41 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-05-24 08:06:40 -0400 |
commit | 0f0dd62fddcbd0f6830ed8ef3d3426ccc46b9250 (patch) | |
tree | 295ac31b109f78873cb191867603943d8562ead0 /include/linux | |
parent | c79d967de3741ceb60c5bbbf1b6f97eab9a89838 (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')
-rw-r--r-- | include/linux/quotaops.h | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 370abb1e99cb..811529241e33 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h | |||
@@ -50,6 +50,14 @@ int dquot_alloc_inode(const struct inode *inode); | |||
50 | int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); | 50 | int dquot_claim_space_nodirty(struct inode *inode, qsize_t number); |
51 | void dquot_free_inode(const struct inode *inode); | 51 | void dquot_free_inode(const struct inode *inode); |
52 | 52 | ||
53 | int dquot_disable(struct super_block *sb, int type, unsigned int flags); | ||
54 | /* Suspend quotas on remount RO */ | ||
55 | static inline int dquot_suspend(struct super_block *sb, int type) | ||
56 | { | ||
57 | return dquot_disable(sb, type, DQUOT_SUSPENDED); | ||
58 | } | ||
59 | int dquot_resume(struct super_block *sb, int type); | ||
60 | |||
53 | int dquot_commit(struct dquot *dquot); | 61 | int dquot_commit(struct dquot *dquot); |
54 | int dquot_acquire(struct dquot *dquot); | 62 | int dquot_acquire(struct dquot *dquot); |
55 | int dquot_release(struct dquot *dquot); | 63 | int dquot_release(struct dquot *dquot); |
@@ -67,7 +75,6 @@ int vfs_quota_on_path(struct super_block *sb, int type, int format_id, | |||
67 | int vfs_quota_on_mount(struct super_block *sb, char *qf_name, | 75 | int vfs_quota_on_mount(struct super_block *sb, char *qf_name, |
68 | int format_id, int type); | 76 | int format_id, int type); |
69 | int vfs_quota_off(struct super_block *sb, int type, int remount); | 77 | int vfs_quota_off(struct super_block *sb, int type, int remount); |
70 | int vfs_quota_disable(struct super_block *sb, int type, unsigned int flags); | ||
71 | int vfs_quota_sync(struct super_block *sb, int type, int wait); | 78 | int vfs_quota_sync(struct super_block *sb, int type, int wait); |
72 | int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); | 79 | int vfs_get_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); |
73 | int vfs_set_dqinfo(struct super_block *sb, int type, struct if_dqinfo *ii); | 80 | int 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 | ||
79 | int __dquot_transfer(struct inode *inode, struct dquot **transfer_to); | 86 | int __dquot_transfer(struct inode *inode, struct dquot **transfer_to); |
80 | int dquot_transfer(struct inode *inode, struct iattr *iattr); | 87 | int dquot_transfer(struct inode *inode, struct iattr *iattr); |
81 | int vfs_dq_quota_on_remount(struct super_block *sb); | ||
82 | 88 | ||
83 | static inline struct mem_dqinfo *sb_dqinfo(struct super_block *sb, int type) | 89 | static 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 | ||
234 | static inline int vfs_dq_quota_on_remount(struct super_block *sb) | ||
235 | { | ||
236 | return 0; | ||
237 | } | ||
238 | |||
239 | static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) | 240 | static 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 | ||
266 | static inline int dquot_disable(struct super_block *sb, int type, | ||
267 | unsigned int flags) | ||
268 | { | ||
269 | return 0; | ||
270 | } | ||
271 | |||
272 | static inline int dquot_suspend(struct super_block *sb, int type) | ||
273 | { | ||
274 | return 0; | ||
275 | } | ||
276 | |||
277 | static 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 */ |