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>

diff --git a/fs/quota_v2.c b/fs/quota_v2.c
index a87f1028a425953c7b4a6dff8b9962387cd3d733..b618b563635c6322e63be9fa00c70d0d0ad7f5b6 100644 (file)
--- a/fs/quota_v2.c
+++ b/fs/quota_v2.c
@@ -71,6 +71,7 @@ static int v2_read_file_info(struct super_block *sb, int type)
 {
        struct v2_disk_dqinfo dinfo;
        struct mem_dqinfo *info = sb_dqinfo(sb, type);
+       struct qtree_mem_dqinfo *qinfo;
        ssize_t size;
 
        size = sb->s_op->quota_read(sb, type, (char *)&dinfo,
@@ -80,22 +81,29 @@ static int v2_read_file_info(struct super_block *sb, int type)
                        sb->s_id);
                return -1;
        }
+       info->dqi_priv = kmalloc(sizeof(struct qtree_mem_dqinfo), GFP_NOFS);
+       if (!info->dqi_priv) {
+               printk(KERN_WARNING
+                      "Not enough memory for quota information structure.\n");
+               return -1;
+       }
+       qinfo = info->dqi_priv;
        /* limits are stored as unsigned 32-bit data */
        info->dqi_maxblimit = 0xffffffff;
        info->dqi_maxilimit = 0xffffffff;
        info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
        info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
        info->dqi_flags = le32_to_cpu(dinfo.dqi_flags);
-       info->u.v2_i.i.dqi_sb = sb;
-       info->u.v2_i.i.dqi_type = type;
-       info->u.v2_i.i.dqi_blocks = le32_to_cpu(dinfo.dqi_blocks);
-       info->u.v2_i.i.dqi_free_blk = le32_to_cpu(dinfo.dqi_free_blk);
-       info->u.v2_i.i.dqi_free_entry = le32_to_cpu(dinfo.dqi_free_entry);
-       info->u.v2_i.i.dqi_blocksize_bits = V2_DQBLKSIZE_BITS;
-       info->u.v2_i.i.dqi_usable_bs = 1 << V2_DQBLKSIZE_BITS;
-       info->u.v2_i.i.dqi_qtree_depth = qtree_depth(&info->u.v2_i.i);
-       info->u.v2_i.i.dqi_entry_size = sizeof(struct v2_disk_dqblk);
-       info->u.v2_i.i.dqi_ops = &v2_qtree_ops;
+       qinfo->dqi_sb = sb;
+       qinfo->dqi_type = type;
+       qinfo->dqi_blocks = le32_to_cpu(dinfo.dqi_blocks);
+       qinfo->dqi_free_blk = le32_to_cpu(dinfo.dqi_free_blk);
+       qinfo->dqi_free_entry = le32_to_cpu(dinfo.dqi_free_entry);
+       qinfo->dqi_blocksize_bits = V2_DQBLKSIZE_BITS;
+       qinfo->dqi_usable_bs = 1 << V2_DQBLKSIZE_BITS;
+       qinfo->dqi_qtree_depth = qtree_depth(qinfo);
+       qinfo->dqi_entry_size = sizeof(struct v2_disk_dqblk);
+       qinfo->dqi_ops = &v2_qtree_ops;
        return 0;
 }
 
@@ -104,6 +112,7 @@ static int v2_write_file_info(struct super_block *sb, int type)
 {
        struct v2_disk_dqinfo dinfo;
        struct mem_dqinfo *info = sb_dqinfo(sb, type);
+       struct qtree_mem_dqinfo *qinfo = info->dqi_priv;
        ssize_t size;
 
        spin_lock(&dq_data_lock);
@@ -112,9 +121,9 @@ static int v2_write_file_info(struct super_block *sb, int type)
        dinfo.dqi_igrace = cpu_to_le32(info->dqi_igrace);
        dinfo.dqi_flags = cpu_to_le32(info->dqi_flags & DQF_MASK);
        spin_unlock(&dq_data_lock);
-       dinfo.dqi_blocks = cpu_to_le32(info->u.v2_i.i.dqi_blocks);
-       dinfo.dqi_free_blk = cpu_to_le32(info->u.v2_i.i.dqi_free_blk);
-       dinfo.dqi_free_entry = cpu_to_le32(info->u.v2_i.i.dqi_free_entry);
+       dinfo.dqi_blocks = cpu_to_le32(qinfo->dqi_blocks);
+       dinfo.dqi_free_blk = cpu_to_le32(qinfo->dqi_free_blk);
+       dinfo.dqi_free_entry = cpu_to_le32(qinfo->dqi_free_entry);
        size = sb->s_op->quota_write(sb, type, (char *)&dinfo,
               sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
        if (size != sizeof(struct v2_disk_dqinfo)) {
@@ -150,7 +159,7 @@ static void v2_mem2diskdqb(void *dp, struct dquot *dquot)
        struct v2_disk_dqblk *d = dp;
        struct mem_dqblk *m = &dquot->dq_dqb;
        struct qtree_mem_dqinfo *info =
-                       &sb_dqinfo(dquot->dq_sb, dquot->dq_type)->u.v2_i.i;
+                       sb_dqinfo(dquot->dq_sb, dquot->dq_type)->dqi_priv;
 
        d->dqb_ihardlimit = cpu_to_le32(m->dqb_ihardlimit);
        d->dqb_isoftlimit = cpu_to_le32(m->dqb_isoftlimit);
@@ -169,7 +178,7 @@ static int v2_is_id(void *dp, struct dquot *dquot)
 {
        struct v2_disk_dqblk *d = dp;
        struct qtree_mem_dqinfo *info =
-                       &sb_dqinfo(dquot->dq_sb, dquot->dq_type)->u.v2_i.i;
+                       sb_dqinfo(dquot->dq_sb, dquot->dq_type)->dqi_priv;
 
        if (qtree_entry_unused(info, dp))
                return 0;
@@ -178,24 +187,30 @@ static int v2_is_id(void *dp, struct dquot *dquot)
 
 static int v2_read_dquot(struct dquot *dquot)
 {
-       return qtree_read_dquot(&sb_dqinfo(dquot->dq_sb, dquot->dq_type)->u.v2_i.i, dquot);
+       return qtree_read_dquot(sb_dqinfo(dquot->dq_sb, dquot->dq_type)->dqi_priv, dquot);
 }
 
 static int v2_write_dquot(struct dquot *dquot)
 {
-       return qtree_write_dquot(&sb_dqinfo(dquot->dq_sb, dquot->dq_type)->u.v2_i.i, dquot);
+       return qtree_write_dquot(sb_dqinfo(dquot->dq_sb, dquot->dq_type)->dqi_priv, dquot);
 }
 
 static int v2_release_dquot(struct dquot *dquot)
 {
-       return qtree_release_dquot(&sb_dqinfo(dquot->dq_sb, dquot->dq_type)->u.v2_i.i, dquot);
+       return qtree_release_dquot(sb_dqinfo(dquot->dq_sb, dquot->dq_type)->dqi_priv, dquot);
+}
+
+static int v2_free_file_info(struct super_block *sb, int type)
+{
+       kfree(sb_dqinfo(sb, type)->dqi_priv);
+       return 0;
 }
 
 static struct quota_format_ops v2_format_ops = {
        .check_quota_file       = v2_check_quota_file,
        .read_file_info         = v2_read_file_info,
        .write_file_info        = v2_write_file_info,
-       .free_file_info         = NULL,
+       .free_file_info         = v2_free_file_info,
        .read_dqblk             = v2_read_dquot,
        .commit_dqblk           = v2_write_dquot,
        .release_dqblk          = v2_release_dquot,

diff --git a/include/linux/dqblk_v1.h b/include/linux/dqblk_v1.h
index 57f1250d5a526c88e8d30ebbd277c878b60c6e6c..9cea901f5bba08a6813ad3685d0dbb8d2a86dc35 100644 (file)
--- 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 e5e22a787d586b545d174fbb1f4acc9691215f54..ff8af1b4bda7daeff3544995a9a857b259bf694d 100644 (file)
--- 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 80b8807b498810a5fc526f4efecf46db692b7511..e51dfdc0aef008bc0ea1285185ecc481d319fac3 100644 (file)
--- 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;