vfs: Remove i_dquot field from inode

All filesystems using VFS quotas are now converted to use their private
i_dquot fields. Remove the i_dquot field from generic inode structure.

Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/inode.c b/fs/inode.c
index 26753ba7b6d656473f17158a1c04064fcb6bffdd..2ed95f7caa4f874ea97dbc7ebc698a4d0fc04674 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -143,9 +143,6 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
        inode->i_blocks = 0;
        inode->i_bytes = 0;
        inode->i_generation = 0;
-#ifdef CONFIG_QUOTA
-       memset(&inode->i_dquot, 0, sizeof(inode->i_dquot));
-#endif
        inode->i_pipe = NULL;
        inode->i_bdev = NULL;
        inode->i_cdev = NULL;

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index b80d1fe56f833b0109cb6a0a839823b6dd031826..8f0acef3d18481647507d32e1861420007f38e3d 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -895,9 +895,6 @@ EXPORT_SYMBOL(dqget);
 
 static inline struct dquot **i_dquot(struct inode *inode)
 {
-       /* Temporary workaround until all filesystems are converted. */
-       if (!inode->i_sb->s_op->get_dquots)
-               return inode->i_dquot;
        return inode->i_sb->s_op->get_dquots(inode);
 }
 

diff --git a/fs/super.c b/fs/super.c
index 4512281df8ffbaf9556a7831ed8289bf94d41eef..eae088f6aaaeb6e8a3380adad19fb66feebe9905 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -218,12 +218,6 @@ static struct super_block *alloc_super(struct file_system_type *type, int flags)
        atomic_set(&s->s_active, 1);
        mutex_init(&s->s_vfs_rename_mutex);
        lockdep_set_class(&s->s_vfs_rename_mutex, &type->s_vfs_rename_key);
-       /*
-        * For now MAXQUOTAS check in do_quotactl() will limit quota type
-        * appropriately. When each fs sets allowed_types, we can remove the
-        * line below
-        */
-       s->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;
        mutex_init(&s->s_dquot.dqio_mutex);
        mutex_init(&s->s_dquot.dqonoff_mutex);
        s->s_maxbytes = MAX_NON_LFS;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8c093ad4952216485392d1b249df4bef185ebf88..6eb5337688bd4ccd858fded15546028fb7d1d04b 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -606,9 +606,6 @@ struct inode {
        const struct file_operations    *i_fop; /* former ->i_op->default_file_ops */
        struct file_lock        *i_flock;
        struct address_space    i_data;
-#ifdef CONFIG_QUOTA
-       struct dquot            *i_dquot[MAXQUOTAS];
-#endif
        struct list_head        i_devices;
        union {
                struct pipe_inode_info  *i_pipe;