aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/quota.h
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-07-25 04:46:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 13:53:35 -0400
commit74abb9890dafb12a50dc140de215ed477beb1b88 (patch)
tree30188b5932e54bc67fb88c0d05e5ba631fe9b698 /include/linux/quota.h
parent02a55ca87185e114e5d298a8d00608501dbabf67 (diff)
quota: move function-macros from quota.h to quotaops.h
Move declarations of some macros, which should be in fact functions to quotaops.h. This way they can be later converted to inline functions because we can now use declarations from quota.h. Also add necessary includes of quotaops.h to a few files. [akpm@linux-foundation.org: fix JFS build] [akpm@linux-foundation.org: fix UFS build] [vegard.nossum@gmail.com: fix QUOTA=n build] Signed-off-by: Jan Kara <jack@suse.cz> Cc: Vegard Nossum <vegard.nossum@gmail.com> Cc: Arjen Pool <arjenpool@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/quota.h')
-rw-r--r--include/linux/quota.h22
1 files changed, 3 insertions, 19 deletions
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 6f1d97ddf82..f9983ea0ff8 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -41,9 +41,6 @@
41#define __DQUOT_VERSION__ "dquot_6.5.1" 41#define __DQUOT_VERSION__ "dquot_6.5.1"
42#define __DQUOT_NUM_VERSION__ 6*10000+5*100+1 42#define __DQUOT_NUM_VERSION__ 6*10000+5*100+1
43 43
44typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
45typedef __u64 qsize_t; /* Type in which we store sizes */
46
47/* Size of blocks in which are counted size limits */ 44/* Size of blocks in which are counted size limits */
48#define QUOTABLOCK_BITS 10 45#define QUOTABLOCK_BITS 10
49#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS) 46#define QUOTABLOCK_SIZE (1 << QUOTABLOCK_BITS)
@@ -172,6 +169,9 @@ enum {
172 169
173#include <asm/atomic.h> 170#include <asm/atomic.h>
174 171
172typedef __kernel_uid32_t qid_t; /* Type in which we store ids in memory */
173typedef __u64 qsize_t; /* Type in which we store sizes */
174
175extern spinlock_t dq_data_lock; 175extern spinlock_t dq_data_lock;
176 176
177/* Maximal numbers of writes for quota operation (insert/delete/update) 177/* Maximal numbers of writes for quota operation (insert/delete/update)
@@ -225,9 +225,6 @@ struct super_block;
225extern void mark_info_dirty(struct super_block *sb, int type); 225extern void mark_info_dirty(struct super_block *sb, int type);
226#define info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags) 226#define info_dirty(info) test_bit(DQF_INFO_DIRTY_B, &(info)->dqi_flags)
227 227
228#define sb_dqopt(sb) (&(sb)->s_dquot)
229#define sb_dqinfo(sb, type) (sb_dqopt(sb)->info+(type))
230
231struct dqstats { 228struct dqstats {
232 int lookups; 229 int lookups;
233 int drops; 230 int drops;
@@ -335,19 +332,6 @@ struct quota_info {
335 struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */ 332 struct quota_format_ops *ops[MAXQUOTAS]; /* Operations for each type */
336}; 333};
337 334
338#define sb_has_quota_enabled(sb, type) ((type)==USRQUOTA ? \
339 (sb_dqopt(sb)->flags & DQUOT_USR_ENABLED) : (sb_dqopt(sb)->flags & DQUOT_GRP_ENABLED))
340
341#define sb_any_quota_enabled(sb) (sb_has_quota_enabled(sb, USRQUOTA) | \
342 sb_has_quota_enabled(sb, GRPQUOTA))
343
344#define sb_has_quota_suspended(sb, type) \
345 ((type) == USRQUOTA ? (sb_dqopt(sb)->flags & DQUOT_USR_SUSPENDED) : \
346 (sb_dqopt(sb)->flags & DQUOT_GRP_SUSPENDED))
347
348#define sb_any_quota_suspended(sb) (sb_has_quota_suspended(sb, USRQUOTA) | \
349 sb_has_quota_suspended(sb, GRPQUOTA))
350
351int register_quota_format(struct quota_format_type *fmt); 335int register_quota_format(struct quota_format_type *fmt);
352void unregister_quota_format(struct quota_format_type *fmt); 336void unregister_quota_format(struct quota_format_type *fmt);
353 337