Commit 4018cfbc authored by Jan Kara's avatar Jan Kara

ext3: Convert to private i_dquot field

CC: linux-ext4@vger.kernel.org
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 64241118
...@@ -615,6 +615,10 @@ struct ext3_inode_info { ...@@ -615,6 +615,10 @@ struct ext3_inode_info {
atomic_t i_sync_tid; atomic_t i_sync_tid;
atomic_t i_datasync_tid; atomic_t i_datasync_tid;
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
struct inode vfs_inode; struct inode vfs_inode;
}; };
......
...@@ -485,6 +485,10 @@ static struct inode *ext3_alloc_inode(struct super_block *sb) ...@@ -485,6 +485,10 @@ static struct inode *ext3_alloc_inode(struct super_block *sb)
ei->vfs_inode.i_version = 1; ei->vfs_inode.i_version = 1;
atomic_set(&ei->i_datasync_tid, 0); atomic_set(&ei->i_datasync_tid, 0);
atomic_set(&ei->i_sync_tid, 0); atomic_set(&ei->i_sync_tid, 0);
#ifdef CONFIG_QUOTA
memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
#endif
return &ei->vfs_inode; return &ei->vfs_inode;
} }
...@@ -764,6 +768,10 @@ static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data, ...@@ -764,6 +768,10 @@ static ssize_t ext3_quota_read(struct super_block *sb, int type, char *data,
size_t len, loff_t off); size_t len, loff_t off);
static ssize_t ext3_quota_write(struct super_block *sb, int type, static ssize_t ext3_quota_write(struct super_block *sb, int type,
const char *data, size_t len, loff_t off); const char *data, size_t len, loff_t off);
static struct dquot **ext3_get_dquots(struct inode *inode)
{
return EXT3_I(inode)->i_dquot;
}
static const struct dquot_operations ext3_quota_operations = { static const struct dquot_operations ext3_quota_operations = {
.write_dquot = ext3_write_dquot, .write_dquot = ext3_write_dquot,
...@@ -803,6 +811,7 @@ static const struct super_operations ext3_sops = { ...@@ -803,6 +811,7 @@ static const struct super_operations ext3_sops = {
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
.quota_read = ext3_quota_read, .quota_read = ext3_quota_read,
.quota_write = ext3_quota_write, .quota_write = ext3_quota_write,
.get_dquots = ext3_get_dquots,
#endif #endif
.bdev_try_to_free_page = bdev_try_to_free_page, .bdev_try_to_free_page = bdev_try_to_free_page,
}; };
...@@ -2001,6 +2010,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) ...@@ -2001,6 +2010,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
sb->s_qcop = &ext3_qctl_operations; sb->s_qcop = &ext3_qctl_operations;
sb->dq_op = &ext3_quota_operations; sb->dq_op = &ext3_quota_operations;
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif #endif
memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid)); memcpy(sb->s_uuid, es->s_uuid, sizeof(es->s_uuid));
INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */ INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment