aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-10-02 12:44:14 -0400
committerMark Fasheh <mfasheh@suse.com>2009-01-05 11:40:21 -0500
commite3d4d56b9715e40ded2a84d0d4fa7f3b6c58983c (patch)
tree67648a89b3c9056d77caa6ef42776cf1053c5e70 /include/linux
parent1ccd14b9c271c1ac6eec5c5ec5def433100e7248 (diff)
quota: Convert union in mem_dqinfo to a pointer
Coming quota support for OCFS2 is going to need quite a bit of additional per-sb quota information. Moreover having fs.h include all the types needed for this structure would be a pain in the a**. So remove the union from mem_dqinfo and add a private pointer for filesystem's use. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dqblk_v1.h4
-rw-r--r--include/linux/dqblk_v2.h4
-rw-r--r--include/linux/quota.h5
3 files changed, 1 insertions, 12 deletions
diff --git a/include/linux/dqblk_v1.h b/include/linux/dqblk_v1.h
index 57f1250d5a52..9cea901f5bba 100644
--- a/include/linux/dqblk_v1.h
+++ b/include/linux/dqblk_v1.h
@@ -17,8 +17,4 @@
17#define V1_DEL_ALLOC 0 17#define V1_DEL_ALLOC 0
18#define V1_DEL_REWRITE 2 18#define V1_DEL_REWRITE 2
19 19
20/* Special information about quotafile */
21struct v1_mem_dqinfo {
22};
23
24#endif /* _LINUX_DQBLK_V1_H */ 20#endif /* _LINUX_DQBLK_V1_H */
diff --git a/include/linux/dqblk_v2.h b/include/linux/dqblk_v2.h
index e5e22a787d58..ff8af1b4bda7 100644
--- a/include/linux/dqblk_v2.h
+++ b/include/linux/dqblk_v2.h
@@ -16,8 +16,4 @@
16#define V2_DEL_ALLOC QTREE_DEL_ALLOC 16#define V2_DEL_ALLOC QTREE_DEL_ALLOC
17#define V2_DEL_REWRITE QTREE_DEL_REWRITE 17#define V2_DEL_REWRITE QTREE_DEL_REWRITE
18 18
19struct v2_mem_dqinfo {
20 struct qtree_mem_dqinfo i;
21};
22
23#endif /* _LINUX_DQBLK_V2_H */ 19#endif /* _LINUX_DQBLK_V2_H */
diff --git a/include/linux/quota.h b/include/linux/quota.h
index 80b8807b4988..e51dfdc0aef0 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -208,10 +208,7 @@ struct mem_dqinfo {
208 unsigned int dqi_igrace; 208 unsigned int dqi_igrace;
209 qsize_t dqi_maxblimit; 209 qsize_t dqi_maxblimit;
210 qsize_t dqi_maxilimit; 210 qsize_t dqi_maxilimit;
211 union { 211 void *dqi_priv;
212 struct v1_mem_dqinfo v1_i;
213 struct v2_mem_dqinfo v2_i;
214 } u;
215}; 212};
216 213
217struct super_block; 214struct super_block;