ext2: Convert to private i_dquot field
authorJan Kara <jack@suse.cz>
Thu, 25 Sep 2014 14:44:45 +0000 (16:44 +0200)
committerJan Kara <jack@suse.cz>
Mon, 10 Nov 2014 09:06:10 +0000 (10:06 +0100)
CC: linux-ext4@vger.kernel.org
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/ext2/ext2.h
fs/ext2/super.c

index d9a17d0b124d3304654f24c430645a38b3e42f12..e4279ead4a05d1972a1791c2698728503859c081 100644 (file)
@@ -689,6 +689,9 @@ struct ext2_inode_info {
        struct mutex truncate_mutex;
        struct inode    vfs_inode;
        struct list_head i_orphan;      /* unlinked but open inodes */
+#ifdef CONFIG_QUOTA
+       struct dquot *i_dquot[MAXQUOTAS];
+#endif
 };
 
 /*
index 170dc41e8bf4418f8de7840c12d46c6f6483e4eb..ae55fddc26a9d46f5ad7c3c2910150b9557ee235 100644 (file)
@@ -166,6 +166,10 @@ static struct inode *ext2_alloc_inode(struct super_block *sb)
                return NULL;
        ei->i_block_alloc_info = NULL;
        ei->vfs_inode.i_version = 1;
+#ifdef CONFIG_QUOTA
+       memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
+#endif
+
        return &ei->vfs_inode;
 }
 
@@ -303,6 +307,10 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
 #ifdef CONFIG_QUOTA
 static ssize_t ext2_quota_read(struct super_block *sb, int type, char *data, size_t len, loff_t off);
 static ssize_t ext2_quota_write(struct super_block *sb, int type, const char *data, size_t len, loff_t off);
+static struct dquot **ext2_get_dquots(struct inode *inode)
+{
+       return EXT2_I(inode)->i_dquot;
+}
 #endif
 
 static const struct super_operations ext2_sops = {
@@ -320,6 +328,7 @@ static const struct super_operations ext2_sops = {
 #ifdef CONFIG_QUOTA
        .quota_read     = ext2_quota_read,
        .quota_write    = ext2_quota_write,
+       .get_dquots     = ext2_get_dquots,
 #endif
 };
 
@@ -1090,6 +1099,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
 #ifdef CONFIG_QUOTA
        sb->dq_op = &dquot_operations;
        sb->s_qcop = &dquot_quotactl_ops;
+       sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
 #endif
 
        root = ext2_iget(sb, EXT2_ROOT_INO);