Commit 75cbe701 authored by Jan Kara's avatar Jan Kara
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 507e1fa6

fs/inode.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

fs/quota/dquot.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}

fs/super.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

include/linux/fs.h

+0 −3
Original line number Diff line number Diff line
@@ -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;