diff options
| author | Jan Kara <jack@suse.cz> | 2008-10-02 18:44:14 +0200 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-01-05 08:40:21 -0800 |
| commit | e3d4d56b9715e40ded2a84d0d4fa7f3b6c58983c (patch) | |
| tree | 67648a89b3c9056d77caa6ef42776cf1053c5e70 /include | |
| parent | 1ccd14b9c271c1ac6eec5c5ec5def433100e7248 (diff) | |
| download | linux-e3d4d56b9715e40ded2a84d0d4fa7f3b6c58983c.tar.gz | |
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')
| -rw-r--r-- | include/linux/dqblk_v1.h | 4 | ||||
| -rw-r--r-- | include/linux/dqblk_v2.h | 4 | ||||
| -rw-r--r-- | include/linux/quota.h | 5 |
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 @@ #define V1_DEL_ALLOC 0 #define V1_DEL_REWRITE 2 -/* Special information about quotafile */ -struct v1_mem_dqinfo { -}; - #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 @@ #define V2_DEL_ALLOC QTREE_DEL_ALLOC #define V2_DEL_REWRITE QTREE_DEL_REWRITE -struct v2_mem_dqinfo { - struct qtree_mem_dqinfo i; -}; - #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 { unsigned int dqi_igrace; qsize_t dqi_maxblimit; qsize_t dqi_maxilimit; - union { - struct v1_mem_dqinfo v1_i; - struct v2_mem_dqinfo v2_i; - } u; + void *dqi_priv; }; struct super_block; |